Moved common options out of Advanced

3 files changed, 19 insertions, 28 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 0c60090..c2eb3c2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -139,6 +139,8 @@
         <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
              increment="1" initial_val="75" label="Image Quality" left="10"
              max_val="100" min_val="0" name="image_quality_slider" width="210" />
+        <check_box bottom_delta="0" follows="left|top" label="High resolution snapshot"
+             left="10" name="high_res_check" />
         <text bottom_delta="-28" follows="left|top" height="20" left="10"
              name="layer_type_label" width="50">
                 Capture:
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 303a9c1..dee3cb1 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
@@ -204,6 +204,12 @@
                   userdata="all" />
       </menu_item_call>
     </menu>
+      <menu_item_call name="Refresh Appearance"
+                      label="Refresh Appearance"
+                      shortcut="control|alt|R">
+        <on_click function="Advanced.RebakeTextures"
+                  userdata="" />
+      </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Gestures..." label="Gestures..."
                     shortcut="control|G">
@@ -931,24 +937,13 @@
 
     <menu_item_separator />
 
-    <menu_item_check name="High-res Snapshot"
-                     label="High-res Snapshot">
-      <on_click function="ToggleControl"
-                userdata="HighResSnapshot" />
-      <on_check control="HighResSnapshot" />
-    </menu_item_check>
+
     <menu_item_check name="Quiet Snapshots to Disk"
                      label="Quiet Snapshots to Disk">
       <on_click function="ToggleControl"
                 userdata="QuietSnapshotsToDisk" />
       <on_check control="QuietSnapshotsToDisk" />
     </menu_item_check>
-    <menu_item_check name="Compress Snapshots to Disk"
-                     label="Compress Snapshots to Disk">
-      <on_click function="ToggleControl"
-                userdata="CompressSnapshotsToDisk" />
-      <on_check control="CompressSnapshotsToDisk" />
-    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
@@ -1618,7 +1613,8 @@
                   userdata="" />
       </menu_item_call>
       <menu_item_check name="Show XUI Names"
-                       label="Show XUI Names">
+                       label="Show XUI Names"
+                       shortcut="control|shift|x">
         <on_click function="Advanced.ToggleXUINames"
                   userdata="" />
         <on_check function="Advanced.CheckXUINames"
@@ -1834,12 +1830,6 @@
         <on_click function="Advanced.DumpAttachments"
                   userdata="" />
       </menu_item_call>
-      <menu_item_call name="Rebake Textures"
-                      label="Rebake Textures"
-                      shortcut="control|alt|R">
-        <on_click function="Advanced.RebakeTextures"
-                  userdata="" />
-      </menu_item_call>
     </menu>
 
 
@@ -1962,12 +1952,6 @@
                 userdata="LimitSelectDistance" />
       <on_check control="LimitSelectDistance" />
     </menu_item_check>
-    <menu_item_check name="Disable Camera Constraints"
-                     label="Disable Camera Constraints">
-      <on_click function="ToggleControl"
-                userdata="DisableCameraConstraints" />
-      <on_check control="DisableCameraConstraints" />
-    </menu_item_check>
     <menu_item_check name="Mouse Smoothing"
                      label="Mouse Smoothing">
       <on_click function="ToggleControl"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 23e357f..1867323 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -79,18 +79,23 @@
              label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
              name="appearance camera movement" radio_style="false"
              tool_tip="Use automatic camera positioning while in edit mode" width="242" />
+        <check_box bottom_delta="-18" control_name="DisableCameraConstraints" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Disable camera constraints" left="148" mouse_opaque="true"
+             name="Disable camera constraints" radio_style="false"
+             tool_tip="Disables camera limits such as distance and terrain" width="242" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-228" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Avatar Display Options:
         </text>
-        <check_box bottom="-232" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom_delta="-4" control_name="FirstPersonAvatarVisible" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp"
              radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="text5" v_pad="0" width="128">
                 Joystick Options: