aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-08 09:00:18 -0700
committerMcCabe Maxsted2009-06-08 09:00:18 -0700
commit51b0a9e05afa2254db4cf7abe4429387d5c89574 (patch)
treea443fa13def0076b708f9baf7c7398c354a4d3c9 /linden/indra/newview/skins
parentRestored zlib1.dll (not a bad entry) (diff)
parentBackported fix from 1.23 for stop animations only being local (VWR-2850) (diff)
downloadmeta-impy-51b0a9e05afa2254db4cf7abe4429387d5c89574.zip
meta-impy-51b0a9e05afa2254db4cf7abe4429387d5c89574.tar.gz
meta-impy-51b0a9e05afa2254db4cf7abe4429387d5c89574.tar.bz2
meta-impy-51b0a9e05afa2254db4cf7abe4429387d5c89574.tar.xz
Merged in 1.2.0-stopallanims
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 6c88b83..72b828d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -445,8 +445,8 @@
445 <menu_item_call name="Set Busy" label="Set Busy"> 445 <menu_item_call name="Set Busy" label="Set Busy">
446 <on_click function="World.SetBusy" userdata="" /> 446 <on_click function="World.SetBusy" userdata="" />
447 </menu_item_call> 447 </menu_item_call>
448 <menu_item_call name="Stop All Animations" enabled="false" 448 <menu_item_call name="Stop Animating My Avatar" enabled="false"
449 label="Stop All Animations"> 449 label="Stop Animating My Avatar">
450 <on_click function="Tools.StopAllAnimations" userdata="" /> 450 <on_click function="Tools.StopAllAnimations" userdata="" />
451 </menu_item_call> 451 </menu_item_call>
452 <menu_item_call name="Release Keys" enabled="false" label="Release Keys"> 452 <menu_item_call name="Release Keys" enabled="false" label="Release Keys">