DEV-38250 Remove temporary preferences tab and organize advanced options

2 files changed, 81 insertions, 138 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index d9602c75ee..2906b73af8 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -43,7 +43,7 @@
      name="pref core"
      tab_group="1"
      tab_position="left"
-     tab_width="120"
+     tab_width="115"
      top="21"
      width="620">
         <panel
@@ -87,8 +87,6 @@
          label="Setup"
          layout="topleft"
          name="input" />
-		<!-- I put back the commented out panels for now, pending 
-		implementation of new default settings. James -->
         <panel
 		 class="panel_preference"
          filename="panel_preferences_advanced.xml"
@@ -98,15 +96,9 @@
         <panel
 		 class="panel_preference"
          filename="panel_preferences_advanced2.xml"
-         label="Move, not to Advanced"
+         label="Move or Kill"
          layout="topleft"
          name="advanced2" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_advanced4.xml"
-         label="Storage/Kill"
-         layout="topleft"
-         name="advanced4" />
     </tab_container>
-     
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index c154c5d21e..0e87c621b9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -10,46 +10,32 @@
  name="advanced"
  top="1"
  width="517">
-        
-        <!-- ADVANCED -->
 
 
-    <check_box
-     control_name="ArrowKeysMoveAvatar"
+           <check_box
+     control_name="UseChatBubbles"
      height="16"
-     label="Arrow keys always move avatar when chatting"
+     label="Bubble Chat"
      layout="topleft"
-     left_delta="30"
-     name="arrow_keys_move_avatar_check"
+     left="30"
      top="20"
-     width="237" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="text_box7"
-     top_pad="10"
-     width="128">
-        Bubble Chat:
-    </text>
+     name="bubble_text_chat"
+     width="150" />
+
     <slider
      control_name="ChatBubbleOpacity"
-     follows="left|top"
-     height="12"
+     height="16"
      increment="0.05"
      initial_value="1"
      label="Opacity"
      layout="topleft"
-     left_delta="0"
+     left="50"
+     top_pad="5"
+     label_width="50"
      name="bubble_chat_opacity"
-     top_pad="10"
      width="200" />
-    
-    <check_box
+
+   <!-- <check_box
      control_name="UIAutoScale"
      height="16"
      label="Resolution independent scale"
@@ -57,19 +43,8 @@
      left="30"
      name="ui_auto_scale"
      top_pad="10"
-     width="256" />
-    <!--text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="30"
-     name="DisplayResLabel"
-     top_pad="10"
-     width="128">
-        Display Resolution:
-    </text>
+     width="256" />-->
+    <!--
     <combo_box
      height="18"
      layout="topleft"
@@ -80,19 +55,19 @@
     <text
      type="string"
      length="1"
-     follows="left|top"
-     height="12"
+     height="25"
      layout="topleft"
      left="30"
+     top_pad="20"
      name="AspectRatioLabel1"
      tool_tip="width / height"
-     top_pad="5"
-     width="160">
-        Aspect Ratio:
+     label_width="50"
+     width="120">
+        Aspect Ratio
     </text>
     <combo_box
      allow_text_entry="true"
-     height="16"
+     height="25"
      layout="topleft"
      left_pad="0"
      max_chars="100"
@@ -102,89 +77,67 @@
      width="150">
         <combo_box.item
          enabled="true"
-         label="4:3 (Standard CRT)"
+         label=" 4:3 (Standard CRT)"
          name="item1"
          value="1.333333" />
         <combo_box.item
          enabled="true"
-         label="5:4 (1280x1024 LCD)"
+         label=" 5:4 (1280x1024 LCD)"
          name="item2"
          value="1.25" />
         <combo_box.item
          enabled="true"
-         label="8:5 (Widescreen)"
+         label=" 8:5 (Widescreen)"
          name="item3"
          value="1.6" />
         <combo_box.item
          enabled="true"
-         label="16:9 (Widescreen)"
+         label=" 16:9 (Widescreen)"
          name="item4"
          value="1.7777777" />
     </combo_box>
     <check_box
      control_name="FullScreenAutoDetectAspectRatio"
-     height="16"
-     label="Auto-detect ratio"
+     height="25"
+     label="Auto-detect"
      layout="topleft"
-     left_pad="5"
+     left_pad="10"
      name="aspect_auto_detect"
-     top_delta="1"
      width="256">
         <check_box.commit_callback
          function="Pref.AutoDetectAspect" />
     </check_box>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     name=" Camera Options:"
-     top_pad="10"
-     width="266">
-        Camera Options:
-    </text>
-    <text
+
+     <text
      type="string"
      length="1"
-     follows="left|top"
      height="10"
-     layout="topleft"
      left="30"
-     name="camera_fov_label"
-     top_pad="10"
-     width="128">
-        Camera View Angle:
-    </text>
-    <slider 
+     text_color="EmphasisColor"
+     name="text_box1"
+     top_pad="30"
+     width="270">
+Camera:
+	</text>
+    <slider
      can_edit_text="true"
 	 control_name="CameraAngle"
      decimal_digits="2"
+     top_pad="10"
      follows="left|top"
      height="16"
      increment="0.025"
      initial_value="1.57"
      layout="topleft"
-     left="128"
+     label_width="100"
+     label="View Angle"
+     left="30"
      max_val="2.97"
      min_val="0.17"
      name="camera_fov"
      show_text="false"
-     top_delta="0"
-     width="128" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     name="Camera Follow Distance:"
-     top_pad="10"
-     width="128">
-        Camera Follow Distance:
-    </text>
+     width="240" />
+
     <slider
      can_edit_text="true"
      control_name="CameraOffsetScale"
@@ -194,67 +147,65 @@
      increment="0.025"
      initial_value="1"
      layout="topleft"
-     left_delta="128"
+     label="Distance"
+     left="30"
+     label_width="100"
      max_val="3"
      min_val="0.5"
      name="camera_offset_scale"
      show_text="false"
-     top_delta="0"
-     width="128" />
-    
+     width="240" />
+     <text
+     type="string"
+     length="1"
+     height="10"
+     left="30"
+     name="text_box1"
+     width="270">
+Automatic positioning for:
+	</text>
         <check_box
      control_name="EditCameraMovement"
-     height="16"
-     label="Automatic Edit Camera Movement"
+     height="20"
+     label="Build/Edit"
      layout="topleft"
-     left="10"
+     left="50"
      name="edit_camera_movement"
      tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-     top_pad="5"
-     width="201" />
+     width="280" />
     <check_box
      control_name="AppearanceCameraMovement"
      height="16"
-     label="Automatic Appearance Camera Movement"
+     label="Appearance"
      layout="topleft"
-     left_pad="5"
      name="appearance_camera_movement"
      tool_tip="Use automatic camera positioning while in edit mode"
-     top_delta="0"
      width="242" />
 
-    <text
+     <text
      type="string"
      length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="text2"
-     top_pad="5"
-     width="128">
-        Avatar Display Options:
-    </text>
+     height="10"
+     left="30"
+     text_color="EmphasisColor"
+     name="text_box1"
+     top_pad="30"
+     width="270">
+My Avatar:
+	</text>
     <check_box
      control_name="FirstPersonAvatarVisible"
-     height="16"
-     label="Show Avatar in Mouselook"
+     height="20"
+     label="Show me in Mouselook"
      layout="topleft"
-     left_pad="10"
      name="first_person_avatar_visible"
-     top_delta="0"
      width="256" />
-    
-        <check_box
-     control_name="UseChatBubbles"
-     height="16"
-     label="Show chat bubbles"
+    <check_box
+     control_name="ArrowKeysMoveAvatar"
+     height="20"
+     label="Arrow keys always move me"
      layout="topleft"
      left="30"
-     name="bubble_text_chat"
-     top_pad="5"
-     width="400" />
-
-
-
+     name="arrow_keys_move_avatar_check"
+     width="237" />
 </panel>
\ No newline at end of file