5 files changed, 30 insertions, 70 deletions

diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 47bc60e..16da49d 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -109,6 +109,7 @@ LLPanelGeneral::LLPanelGeneral()
 BOOL LLPanelGeneral::postBuild()
 {
         childSetCommitCallback("fade_out_combobox", set_render_name_fade_out);
+        childSetAction("reset_ui_size", onClickResetUISize, this);
 
         std::string region_name_prompt = getString("region_name_prompt");
 
@@ -242,3 +243,10 @@ void LLPanelGeneral::clickShowStartLocation(LLUICtrl*, void* user_data)
 {
         LLPanelLogin::refreshLocation( false ); // in case LLPanelLogin is visible
 }
+
+// static
+void LLPanelGeneral::onClickResetUISize(void* user_data)
+{
+        gSavedSettings.setF32("UIScaleFactor", 1.0f);
+        gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
+}
\ No newline at end of file
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 95a95f8..00dc874 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -56,6 +56,7 @@ public:
         static void clickShowStartLocation(LLUICtrl*, void* user_data);
         static void set_start_location(LLUICtrl* ctrl, void* data);
         static void set_specific_start_location(LLLineEditor* line_editor, void* data);
+        static void onClickResetUISize(void*);
 
 protected:
         S32 mRenderName;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index f99a324..d607afe 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1642,7 +1642,6 @@ class LLObjectEnableOpen : public view_listener_t
         }
 };
 
-
 class LLViewCheckBuildMode : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -3239,17 +3238,6 @@ class LLViewFullscreen : public view_listener_t
         }
 };
 
-class LLViewDefaultUISize : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gSavedSettings.setF32("UIScaleFactor", 1.0f);
-                gSavedSettings.setBOOL("UIAutoScale", FALSE);   
-                gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
-                return true;
-        }
-};
-
 class LLEditDuplicate : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -5086,10 +5074,6 @@ 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());
@@ -5222,10 +5206,6 @@ 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();
@@ -7229,25 +7209,6 @@ 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)
@@ -9702,12 +9663,10 @@ 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");
         addMenu(new LLViewFullscreen(), "View.Fullscreen");
-        addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
 
         addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
         addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
@@ -9718,7 +9677,6 @@ 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 89c1fe8..a741b94 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,10 +281,6 @@
       <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" />
@@ -428,7 +424,7 @@
                   userdata="hideparticles" />
       </menu_item_check>
       <menu_item_separator />
-      <menu name="Beacon Width" color="0 0 0 1" create_jump_keys="true"
+      <menu name="Beacon Width" create_jump_keys="true"
             label="Beacon Width" opaque="true" tear_off="true">
         <menu_item_call name="Beacon Width 1" label="1">
           <on_click function="View.BeaconWidth" userdata="1" />
@@ -444,34 +440,27 @@
         </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_item_call name="Zoom In" label="Zoom In"
-                    shortcut="control|0">
-      <on_click function="View.ZoomIn" userdata="" />
-    </menu_item_call>
-    <menu_item_call name="Zoom Default" label="Zoom Default"
-                    shortcut="control|9">
-      <on_click function="View.ZoomDefault" userdata="" />
-    </menu_item_call>
-    <menu_item_call name="Zoom Out" label="Zoom Out"
-                    shortcut="control|8">
-      <on_click function="View.ZoomOut" userdata="" />
-    </menu_item_call>
+    <menu name="Zoom Level" create_jump_keys="true"
+            label="Zoom Level" opaque="true" tear_off="true">
+      <menu_item_call name="Zoom In" label="Zoom In"
+                      shortcut="control|0">
+        <on_click function="View.ZoomIn" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Zoom Default" label="Zoom Default"
+                      shortcut="control|9">
+        <on_click function="View.ZoomDefault" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Zoom Out" label="Zoom Out"
+                      shortcut="control|8">
+        <on_click function="View.ZoomOut" userdata="" />
+      </menu_item_call>
+    </menu>
     <menu_item_separator />
     <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen"
                     shortcut="alt|Enter">
       <on_click function="View.Fullscreen" userdata="" />
     </menu_item_call>
-    <menu_item_call name="Set UI Size to Default"
-                    label="Set UI Size to Default">
-      <on_click function="View.DefaultUISize" userdata="" />
-    </menu_item_call>
   </menu>
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 092daab..7bd966a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -63,7 +63,11 @@
         <slider bottom="-217" can_edit_text="true" control_name="UIScaleFactor"
              decimal_digits="3" enabled="true" height="16" increment="0.025"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             name="UI Scale" show_text="true" value="1" width="256" />
+             name="UI Scale" show_text="true" value="1" width="220" />
+  <button bottom="-221" enabled="true" follows="left|top"
+             font="SansSerif" halign="center" height="22" label="Reset"
+             label_selected="Reset" left_delta="226" mouse_opaque="true"
+             name="reset_ui_size" scale_image="true" width="80" />
         <check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"