diff options
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/ao.png | bin | 0 -> 236 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index b84d9cf780..5699174f4f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -166,6 +166,7 @@ with the same filename but different name <texture name="Command_Voice_Icon" file_name="toolbar_icons/nearbyvoice.png" preload="true" /> <texture name="Command_FavoriteFolder_Icon" file_name="toolbar_icons/favorite_folder.png" preload="true" /> <texture name="Command_Resync_Animations" file_name="toolbar_icons/resync_animations.png" preload="true" /> + <texture name="Command_AO_Icon" file_name="toolbar_icons/ao.png" preload="true" /> <texture name="Caret_Bottom_Icon" file_name="toolbar_icons/caret_bottom.png" preload="true" scale.left="1" scale.top="23" scale.right="15" scale.bottom="1" /> <texture name="Caret_Right_Icon" file_name="toolbar_icons/caret_right.png" preload="true" scale.left="5" scale.top="15" scale.right="28" scale.bottom="1" /> <texture name="Caret_Left_Icon" file_name="toolbar_icons/caret_left.png" preload="true" scale.left="1" scale.top="15" scale.right="23" scale.bottom="1" /> diff --git a/indra/newview/skins/default/textures/toolbar_icons/ao.png b/indra/newview/skins/default/textures/toolbar_icons/ao.png Binary files differnew file mode 100644 index 0000000000..20fff67938 --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/ao.png diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 48ee13bf21..2272389125 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -479,6 +479,14 @@ <menu_item_check.on_click function="World.AlwaysRun" /> </menu_item_check> + <menu_item_check + label="Override animations" + name="AnimationOverride"> + <menu_item_check.on_check + function="AreAnimationsOverridden" /> + <menu_item_check.on_click + function="ToggleAnimationOverride" /> + </menu_item_check> <menu_item_separator/> <menu_item_check label="Gestures..." diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b442024361..8568874089 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4230,6 +4230,7 @@ name="Command_360_Capture_Label">360 snapshot</string> <string name="Command_Voice_Label">Voice settings</string> <string name="Command_FavoriteFolder_Label">Favorite folder</string> <string name="Command_ResyncAnimations_Label">Resync animations</string> + <string name="Command_AO_Label">AO</string> <string name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string> @@ -4266,6 +4267,7 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string> <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string> <string name="Command_FavoriteFolder_Tooltip">Open your favorite inventory folder</string> <string name="Command_ResyncAnimations_Tooltip">Synchronizes avatar animations</string> + <string name="Command_AO_Tooltip">Animation Override</string> <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string> <string name="Toolbar_Left_Tooltip" >currently in your left toolbar</string> |
