Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added tools->avatar tool submenu when rightclicking rigged mesh. Fixed 'reset skeleton and animations' on self pie menu not working.

Browse Source
This commit is contained in:
Shyotl
2019-07-21 01:57:30 -05:00
parent 225d174ec6
commit 35433cb8a4
5 changed files with 214 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
indra/newview/llviewermenu.cpp
View File

@@ -6088,13 +6088,8 @@ class LLAvatarResetSkeleton: public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
LLVOAvatar* avatar = NULL; LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(); if (avatar)
if (obj)
{
avatar = obj->getAvatar();
}
if(avatar)
{ {
avatar->resetSkeleton(false); avatar->resetSkeleton(false);
} }
@@ -6102,35 +6097,28 @@ class LLAvatarResetSkeleton: public view_listener_t
} }
}; };
class LLAvatarResetSkeletonAndAnimations : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLVOAvatar* avatar = NULL;
LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (obj)
{
avatar = obj->getAvatar();
}
if(avatar)
{
avatar->resetSkeleton(true);
}
return true;
}
};
class LLAvatarEnableResetSkeleton: public view_listener_t class LLAvatarEnableResetSkeleton: public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(); LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
if (obj && obj->getAvatar()) return avatar != nullptr;
}
};
class LLAvatarResetSkeletonAndAnimations : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{ {
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
if (avatar)
{
avatar->resetSkeleton(true);
}
return true; return true;
} }
return false;
}
}; };
bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjectSelectionHandle selection) bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjectSelectionHandle selection)

11
indra/newview/skins/default/xui/de/menu_pie_attachment.xml
View File

@@ -20,6 +20,17 @@
<menu_item_call label="Daten" name="Data"/> <menu_item_call label="Daten" name="Data"/>
<menu_item_call label="Nicht anzeigen" name="Derender"/> <menu_item_call label="Nicht anzeigen" name="Derender"/>
<menu_item_call label="Neu laden" name="Reload Textures"/> <menu_item_call label="Neu laden" name="Reload Textures"/>
<pie_menu label="Avatar" name="Avatar Tools">
<menu_item_call label="Neu laden" name="Reload Textures"/>
<menu_item_call label="Skelett reset" name="Reset Skeleton"/>
<menu_item_call label="Anim. reset" name="Reset Skeleton And Animations"/>
<menu_item_call label="Animationen..." name="Anims..."/>
<menu_item_call label="S. Count" name="ScriptCount"/>
<menu_item_call label="Skript-Info" name="Script Info"/>
<!--menu_item_call label="Debug" name="Debug Layers"/-->
<menu_item_call label="UUID kopieren" name="CopyUUID"/>
<menu_item_call label="Save OBJ..." name="Save OBJ..."/>
</pie_menu>
<menu_item_call label="Save OBJ..." name="Save OBJ..."/> <menu_item_call label="Save OBJ..." name="Save OBJ..."/>
<menu_item_call label="Save DAE..." name="Save DAE..."/> <menu_item_call label="Save DAE..." name="Save DAE..."/>
</pie_menu> </pie_menu>

28
indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
View File

@@ -68,6 +68,34 @@
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures"> <menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Object.ReloadTextures" /> <on_click function="Object.ReloadTextures" />
</menu_item_call> </menu_item_call>
<pie_menu label="Avatar" name="Avatar Tools">
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Avatar.ReloadTextures" />
</menu_item_call>
<menu_item_call enabled="true" label="Reset Skel" mouse_opaque="true" name="Reset Skeleton">
<on_click function="Avatar.ResetSkeleton" />
</menu_item_call>
<menu_item_call enabled="true" label="Reset Anims" mouse_opaque="true" name="Reset Skeleton And Animations">
<on_click function="Avatar.ResetSkeletonAndAnimations" />
</menu_item_call>
<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true" name="Anims...">
<on_click function="ShowFloater" userdata="anims_explorer" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" userdata="agent"/>
<on_visible function="Object.VisibleScriptCount" userdata="agent"/>
</menu_item_call>
<menu_item_call label="Script Info" mouse_opaque="true" name="Script Info">
<on_click function="ShowFloater" userdata="script info" />
<on_visible function="Self.VisibleScriptInfo" />
</menu_item_call>
<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
<on_click function="Avatar.CopyUUID" />
</menu_item_call>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Avatar.SaveAsOBJ" />
</menu_item_call>
</pie_menu>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ..."> <menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Object.SaveAsOBJ" /> <on_click function="Object.SaveAsOBJ" />
<on_enable function="Object.EnableExport" /> <on_enable function="Object.EnableExport" />

14
indra/newview/skins/default/xui/en-us/menu_pie_self.xml
View File

@@ -85,6 +85,13 @@
<on_enable function="Self.EnableRemoveAllAttachments" /> <on_enable function="Self.EnableRemoveAllAttachments" />
</menu_item_call> </menu_item_call>
</pie_menu> </pie_menu>
<menu_item_call enabled="true" label="Stand Up" name="Stand Up Self">
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sit Down,Stand Up"/>
</menu_item_call>
<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
<on_click function="ShowFloater" userdata="gestures" />
</menu_item_call>
<pie_menu label="Tools" name="Tools"> <pie_menu label="Tools" name="Tools">
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures"> <menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Avatar.ReloadTextures" /> <on_click function="Avatar.ReloadTextures" />
@@ -117,13 +124,6 @@
<on_click function="Avatar.SaveAsOBJ" /> <on_click function="Avatar.SaveAsOBJ" />
</menu_item_call> </menu_item_call>
</pie_menu> </pie_menu>
<menu_item_call enabled="true" label="Stand Up" name="Stand Up Self">
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sit Down,Stand Up"/>
</menu_item_call>
<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
<on_click function="ShowFloater" userdata="gestures" />
</menu_item_call>
<menu_item_call enabled="true" label="Appearance..." name="Appearance..."> <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
<on_click function="ShowFloater" userdata="appearance" /> <on_click function="ShowFloater" userdata="appearance" />
<on_enable function="Edit.EnableCustomizeAvatar" /> <on_enable function="Edit.EnableCustomizeAvatar" />

12
indra/newview/skins/default/xui/es/menu_pie_attachment.xml
View File

@@ -26,8 +26,18 @@
<menu_item_call label="Datos" name="Data"/> <menu_item_call label="Datos" name="Data"/>
<menu_item_call label="Desdibujar" name="Derender"/> <menu_item_call label="Desdibujar" name="Derender"/>
<menu_item_call label="Recargar" name="Reload Textures"/> <menu_item_call label="Recargar" name="Reload Textures"/>
<pie_menu label="Avatar" name="Avatar Tools">
<menu_item_call label="Recargar" name="Reload Textures"/>
<menu_item_call label="Animaciones..." name="Anims..."/>
<menu_item_call label="Contar Scripts" name="ScriptCount"/>
<menu_item_call label="Info de Script" name="Script Info"/>
<menu_item_call label="Depurar..." name="Debug Layers"/>
<menu_item_call label="Copiar UUID" name="CopyUUID"/>
<menu_item_call label="Guardar OBJ..." name="Save OBJ..."/>
</pie_menu>
<menu_item_call label="Guardar OBJ..." name="Save OBJ..."/> <menu_item_call label="Guardar OBJ..." name="Save OBJ..."/>
<menu_item_call label="Guardar DAE..." name="Save DAE..."/> <menu_item_call label="Guardar DAE..." name="Save DAE..."/>
</pie_menu> </pie_menu>
<menu_item_call label="Apariencia..." name="Appearance..."/> <menu_item_call label="Apariencia..." name="Appearance..."/>
<menu_item_call label="Editar..." name="Edit..."/></pie_menu> <menu_item_call label="Editar..." name="Edit..."/>
</pie_menu>