Removed/moved unnecessary options

2 files changed, 21 insertions, 28 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 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"