diff options
author | Jacek Antonelli | 2009-09-23 02:49:45 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-09-23 02:49:45 -0500 |
commit | 07bd1f1028f1ed7f8127059a233016f7428fc8ac (patch) | |
tree | c4f153930da1b300b908ed0dd9d95acf974afde2 /linden/indra | |
parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
download | meta-impy-07bd1f1028f1ed7f8127059a233016f7428fc8ac.zip meta-impy-07bd1f1028f1ed7f8127059a233016f7428fc8ac.tar.gz meta-impy-07bd1f1028f1ed7f8127059a233016f7428fc8ac.tar.bz2 meta-impy-07bd1f1028f1ed7f8127059a233016f7428fc8ac.tar.xz |
Moved "Show HUD Attachments" back to View, restored shortcut.
Reverts earlier change (Jan 27) which moved it to Advanced menu.
This reverts commit e43ad0a92e04eb2fd55f42f983e9d7495df90ae9.
Conflicts:
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 12 |
1 files changed, 5 insertions, 7 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 81c49e7..512ee16 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 | |||
@@ -383,6 +383,11 @@ | |||
383 | <on_click function="View.ToggleRenderType" userdata="hideparticles" /> | 383 | <on_click function="View.ToggleRenderType" userdata="hideparticles" /> |
384 | <on_check function="View.CheckRenderType" userdata="hideparticles" /> | 384 | <on_check function="View.CheckRenderType" userdata="hideparticles" /> |
385 | </menu_item_check> | 385 | </menu_item_check> |
386 | <menu_item_check name="Show HUD Attachments" label="Show HUD Attachments" | ||
387 | shortcut="alt|shift|H"> | ||
388 | <on_click function="View.ShowHUDAttachments" userdata="" /> | ||
389 | <on_check function="View.CheckHUDAttachments" /> | ||
390 | </menu_item_check> | ||
386 | <menu_item_separator /> | 391 | <menu_item_separator /> |
387 | <menu name="Zoom Level" create_jump_keys="true" | 392 | <menu name="Zoom Level" create_jump_keys="true" |
388 | label="Zoom Level" opaque="true" tear_off="true"> | 393 | label="Zoom Level" opaque="true" tear_off="true"> |
@@ -1094,13 +1099,6 @@ | |||
1094 | <on_check function="Advanced.CheckFeature" | 1099 | <on_check function="Advanced.CheckFeature" |
1095 | userdata="flexible" /> | 1100 | userdata="flexible" /> |
1096 | </menu_item_check> | 1101 | </menu_item_check> |
1097 | <menu_item_check name="HUD Attachments" | ||
1098 | label="HUD Attachments" | ||
1099 | shortcut=""> | ||
1100 | <on_click function="View.ShowHUDAttachments" userdata="" /> | ||
1101 | <on_check function="View.CheckHUDAttachments" /> | ||
1102 | </menu_item_check> | ||
1103 | |||
1104 | </menu> | 1102 | </menu> |
1105 | 1103 | ||
1106 | 1104 | ||