summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-05 10:43:14 -0400
committerOz Linden <oz@lindenlab.com>2012-06-05 10:43:14 -0400
commitc432ee1581614ea75230bc59d90671eac875527f (patch)
tree10f4b2c4db1dd1e7d79b2ac49e0c6f2f7e23def8 /indra
parent2ad0bc334dc275f60889d7f083e90b8d2775104d (diff)
parentf9879b8ea922affd4a1e82c45ce120d5e016c705 (diff)
merge changes for storm-1845
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5ba566b175..204b73b043 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -193,6 +193,15 @@
<menu_item_call.on_click
function="View.ToggleUI" />
</menu_item_call>
+ <menu_item_check
+ label="Show HUD Attachments"
+ name="Show HUD Attachments"
+ shortcut="alt|shift|H">
+ <menu_item_check.on_check
+ function="View.CheckHUDAttachments" />
+ <menu_item_check.on_click
+ function="View.ShowHUDAttachments" />
+ </menu_item_check>
<menu_item_separator/>
@@ -1374,15 +1383,6 @@
function="View.HighlightTransparent" />
</menu_item_check>
<menu_item_check
- label="Show HUD Attachments"
- name="Show HUD Attachments"
- shortcut="alt|shift|H">
- <menu_item_check.on_check
- function="View.CheckHUDAttachments" />
- <menu_item_check.on_click
- function="View.ShowHUDAttachments" />
- </menu_item_check>
- <menu_item_check
label="Show Mouselook Crosshairs"
name="ShowCrosshairs">
<menu_item_check.on_check