Restored View > Toolbar and Show HUD Attachments.

Partial revert of earlier commit e79a1cc5.

2 files changed, 39 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4c6de79..c4cbf84 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5073,6 +5073,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterPreference::show(NULL);
                 }
+                else if (floater_name == "toolbar")
+                {
+                        LLToolBar::toggle(NULL);
+                }
                 else if (floater_name == "chat history")
                 {
                         LLFloaterChat::toggleInstance(LLSD());
@@ -5205,6 +5209,10 @@ class LLFloaterVisible : public view_listener_t
                 {
                         new_value = LLFloaterMyFriends::instanceVisible(0);
                 }
+                else if (floater_name == "toolbar")
+                {
+                        new_value = LLToolBar::visible(NULL);
+                }
                 else if (floater_name == "chat history")
                 {
                         new_value = LLFloaterChat::instanceVisible();
@@ -7203,6 +7211,25 @@ class LLViewCheckRenderType : public view_listener_t
         }
 };
 
+class LLViewShowHUDAttachments : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments;
+                return true;
+        }
+};
+
+class LLViewCheckHUDAttachments : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLPipeline::sShowHUDAttachments;
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
 class LLEditEnableTakeOff : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9657,6 +9684,7 @@ void initialize_menus()
         addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon");
         addMenu(new LLViewBeaconWidth(), "View.BeaconWidth");
         addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
+        addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
         addMenu(new LLViewZoomOut(), "View.ZoomOut");
         addMenu(new LLViewZoomIn(), "View.ZoomIn");
         addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
@@ -9671,6 +9699,7 @@ void initialize_menus()
         addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
         addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled");
         addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
+        addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
 
         // World menu
         addMenu(new LLWorldChat(), "World.Chat");
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 a741b94..eb32ee0 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
@@ -281,6 +281,10 @@
       <on_click function="ShowFloater" userdata="inworld browser" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_check name="Toolbar" label="Toolbar">
+      <on_click function="ShowFloater" userdata="toolbar" />
+      <on_check function="FloaterVisible" userdata="toolbar" />
+    </menu_item_check>
     <menu_item_check name="Chat History" label="Local Chat"
                      shortcut="control|H">
       <on_click function="ShowFloater" userdata="chat history" />
@@ -440,6 +444,12 @@
         </menu_item_call>
       </menu>
     </menu>
+    <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">