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

Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer

Browse Source 
# Conflicts:
#	indra/llcommon/llstring.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
This commit is contained in:
Lirusaito
2019-03-18 17:30:34 -04:00
parent d235e045d8 e0194d4d06
commit c5329968f7
101 changed files with 7625 additions and 2526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
View File

@@ -38,9 +38,11 @@
</menu_item_call>
<menu_item_call enabled="true" label="Reset Skeleton" mouse_opaque="true" name="Reset Skeleton">
<on_click function="Avatar.ResetSkeleton" />
<on_enable function="Avatar.EnableResetSkeleton" />
</menu_item_call>
<menu_item_call enabled="true" label="Reset Skeleton And Animations" mouse_opaque="true" name="Reset Skeleton And Animations">
<on_click function="Avatar.ResetSkeletonAndAnimations" />
<on_enable function="Avatar.EnableResetSkeleton" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" />