From 07bd1f1028f1ed7f8127059a233016f7428fc8ac Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 23 Sep 2009 02:49:45 -0500
Subject: 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
---
 ChangeLog.txt                                                |  8 ++++++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 12 +++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f8604f8..5110fd5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2009-09-23  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* Moved "Show HUD Attachments" back to View, restored shortcut.
+	  Reverts earlier change (Jan 27) which moved it to Advanced menu.
+
+	  modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
 2009-09-21 McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* Changed 'Presets' button to 'Sky'.
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 @@
       <on_click function="View.ToggleRenderType" userdata="hideparticles" />
       <on_check function="View.CheckRenderType" userdata="hideparticles" />
     </menu_item_check>
+    <menu_item_check name="Show HUD Attachments" label="Show HUD Attachments"
+                     shortcut="alt|shift|H">
+      <on_click function="View.ShowHUDAttachments" userdata="" />
+      <on_check function="View.CheckHUDAttachments" />
+    </menu_item_check>
     <menu_item_separator />
     <menu name="Zoom Level" create_jump_keys="true"
             label="Zoom Level" opaque="true" tear_off="true">
@@ -1094,13 +1099,6 @@
           <on_check function="Advanced.CheckFeature"
                     userdata="flexible" />
         </menu_item_check>
-        <menu_item_check name="HUD Attachments"
-                         label="HUD Attachments"
-                         shortcut="">
-          <on_click function="View.ShowHUDAttachments" userdata="" />
-          <on_check function="View.CheckHUDAttachments" />
-        </menu_item_check>
-
       </menu>
 
 
-- 
cgit v1.1