STORM-2082 Add back labels for quality and speed slider

Change two sliders back to comboboxes.
Rename label "Other" to "General"
Move Max ARC to top of that list
Move Shaders block to above Mesh block

3 files changed, 278 insertions, 241 deletions

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 9df7f82275..6e340864bc 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1117,7 +1117,7 @@ void LLFloaterPreference::buildPopupLists()
 
 void LLFloaterPreference::refreshEnabledState()
 {	
-	LLUICtrl* ctrl_reflections = getChild<LLUICtrl>("Reflections");
+	LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
 	LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
 	
 	// Reflections
@@ -1207,7 +1207,7 @@ void LLFloaterPreference::refreshEnabledState()
 
 	LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
 	LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
-	LLUICtrl* ctrl_shadow = getChild<LLUICtrl>("ShadowDetail");
+	LLComboBox* ctrl_shadow = getChild<LLComboBox>("ShadowDetail");
 	LLTextBox* shadow_text = getChild<LLTextBox>("RenderShadowDetailText");
 
 	// note, okay here to get from ctrl_deferred as it's twin, ctrl_deferred2 will alway match it
@@ -1290,7 +1290,7 @@ void LLFloaterPreference::refreshEnabledState()
 
 void LLFloaterPreference::disableUnavailableSettings()
 {	
-	LLUICtrl* ctrl_reflections   = getChild<LLUICtrl>("Reflections");
+	LLComboBox* ctrl_reflections   = getChild<LLComboBox>("Reflections");
 	LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
 	LLCheckBoxCtrl* ctrl_avatar_vp     = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
 	LLCheckBoxCtrl* ctrl_avatar_cloth  = getChild<LLCheckBoxCtrl>("AvatarCloth");
@@ -1299,7 +1299,7 @@ void LLFloaterPreference::disableUnavailableSettings()
 	LLCheckBoxCtrl* ctrl_avatar_impostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
 	LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
 	LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
-	LLUICtrl* ctrl_shadows = getChild<LLUICtrl>("ShadowDetail");
+	LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
 	LLTextBox* shadows_text = getChild<LLTextBox>("RenderShadowDetailText");
 	LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
 	LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
@@ -1476,8 +1476,6 @@ void LLFloaterPreference::refresh()
 	updateSliderText(getChild<LLSliderCtrl>("SkyMeshDetail",		true), getChild<LLTextBox>("SkyMeshDetailText",			true));
 	updateSliderText(getChild<LLSliderCtrl>("TerrainDetail",		true), getChild<LLTextBox>("TerrainDetailText",			true));	
 	updateSliderText(getChild<LLSliderCtrl>("MaximumARC",		true), getChild<LLTextBox>("MaximumARCText",			true));	
-	updateSliderText(getChild<LLSliderCtrl>("Reflections",		true), getChild<LLTextBox>("ReflectionsText",			true));	
-	updateSliderText(getChild<LLSliderCtrl>("ShadowDetail",		true), getChild<LLTextBox>("RenderShadowDetailText",			true));	
 }
 
 void LLFloaterPreference::onCommitWindowedMode()
@@ -1736,20 +1734,6 @@ void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_b
 	
 	std::string name = ctrl->getName();
 
-	if ("ShadowDetail" == name)
-	{
-		U32 value = (U32)ctrl->getValue().asInteger();
-		text_box->setText(getString("RenderShadowDetail" + llformat("%d", value)));
-		return;
-	}
-
-	if ("Reflections" == name)
-	{
-		U32 value = (U32)ctrl->getValue().asInteger();
-		text_box->setText(getString("Reflections" + llformat("%d", value)));
-		return;
-	}
-
 	// get range and points when text should change
 	F32 value = (F32)ctrl->getValue().asReal();
 	F32 min = ctrl->getMinValue();
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index edc205927c..638a4e2da8 100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -11,14 +11,6 @@
  single_instance="true"
  title="PREFERENCES"
  width="658">
-   <string name="Reflections0">Minimal</string>
-   <string name="Reflections1">Terrain and trees</string>
-   <string name="Reflections2">All static objects</string>
-   <string name="Reflections3">All avatars and objects</string>
-   <string name="Reflections4">Everything</string>
-   <string name="RenderShadowDetail0">None</string>
-   <string name="RenderShadowDetail1">Sun/Moon</string>
-   <string name="RenderShadowDetail2">Sun/Moon + Projectors</string>
    <button
      follows="right|bottom"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index a53097a117..40b359eb1d 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -66,11 +66,63 @@
     follows="left|top"
     height="12"
     layout="topleft"
-    left="30"
+    left="10"
     name="QualitySpeed"
     top_delta="30" 
     width="400">
-      Quality and speed:
+      Quality &amp; speed:
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    halign="center"
+    height="12"
+    layout="topleft"
+    left="118"
+    name="ShadersPrefText"
+    top_delta="0"
+    width="80">
+       Low
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    halign="center"
+    height="12"
+    layout="topleft"
+    left_delta="87"
+    name="ShadersPrefText2"
+    top_delta="0"
+    width="80">
+       Mid
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    halign="center"
+    height="12"
+    layout="topleft"
+    left_delta="87"
+    name="ShadersPrefText3"
+    top_delta="0"
+    width="80">
+       High
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    halign="center"
+    height="12"
+    layout="topleft"
+    left_delta="85"
+    name="ShadersPrefText4"
+    top_delta="0"
+    width="80">
+       Ultra
   </text>
   <text
     type="string"
@@ -79,7 +131,7 @@
     halign="right"
     height="12"
     layout="topleft"
-    left="35"
+    left="65"
     name="FasterText"
     top_pad="4"
     width="80">
@@ -102,7 +154,7 @@
     height="14"
     image_name="Rounded_Square"
     layout="topleft"
-    left="128"
+    left="158"
     name="LowGraphicsDivet"
     top_delta="-2"
     width="2" />
@@ -167,7 +219,7 @@
     increment="1"
     initial_value="0"
     layout="topleft"
-    left="120"
+    left="150"
     max_val="6"
     name="QualityPerformanceSelection"
     show_text="false"
@@ -319,11 +371,11 @@
             follows="left|top"
             height="16"
             layout="topleft"
-            name="OtherText"
+            name="GeneralText"
             top="0"
             left="5"
             width="128">
-             Other
+             General
           </text>
 
           <slider
@@ -453,85 +505,6 @@
           </text>
 
           <slider
-            control_name="RenderAvatarLODFactor"
-            follows="left|top"
-            height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Detail:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="AvatarMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="AvatarMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="AvatarMeshDetailText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-             Low
-          </text>
-
-          <slider
-            control_name="RenderAvatarPhysicsLODFactor"
-            follows="left|top"
-            height="16"
-            initial_value="100"
-            increment=".05"
-            label="Physics:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="AvatarPhysicsDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="AvatarPhysicsDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="304"
-            name="AvatarPhysicsDetailText"
-            width="128">
-               Low
-          </text>
-
-          <slider
-            control_name="RenderAvatarMaxVisible"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="1"
-            initial_value="12"
-            label="Max. # of non-impostor avatars:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="1"
-            max_val="65"
-            name="MaxNumberAvatarDrawn"
-            top_delta="16"
-            width="325" />
-
-          <slider
             control_name="MaximumARC"
             follows="left|top"
             height="16"
@@ -564,49 +537,23 @@
                Low
           </text>
 
-          <check_box
-            control_name="RenderUseImpostors"
-            height="16"
-            initial_value="true"
-            label="Avatar impostors"
-            layout="topleft"
-            left="30"
-            name="AvatarImpostors"
-            top_delta="20"
-            width="300" />
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="AvatarText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Mesh
-          </text>
-
           <slider
-            control_name="RenderTerrainLODFactor"
+            control_name="RenderAvatarLODFactor"
             follows="left|top"
             height="16"
             increment="0.125"
             initial_value="160"
-            label="Terrain Mesh Detail:"
+            label="Detail:"
             label_width="185"
             layout="topleft"
             left="30"
-            min_val="1"
-            max_val="2"
-            name="TerrainMeshDetail"
+            name="AvatarMeshDetail"
             show_text="false"
             top_delta="16"
             width="300">
             <slider.commit_callback
               function="Pref.UpdateSliderText"
-              parameter="TerrainMeshDetailText" />
+              parameter="AvatarMeshDetailText" />
           </slider>
           <text
             type="string"
@@ -614,31 +561,30 @@
             follows="left|top"
             height="16"
             layout="topleft"
-            name="TerrainMeshDetailText"
-            text_readonly_color="LabelDisabledColor"
+            name="AvatarMeshDetailText"
             top_delta="0"
             left_delta="304"
             width="128">
-               Low
+             Low
           </text>
 
           <slider
-            control_name="RenderTreeLODFactor"
+            control_name="RenderAvatarPhysicsLODFactor"
             follows="left|top"
             height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Trees:"
+            initial_value="100"
+            increment=".05"
+            label="Physics:"
             label_width="185"
             layout="topleft"
             left="30"
-            name="TreeMeshDetail"
+            name="AvatarPhysicsDetail"
             show_text="false"
             top_delta="16"
             width="300">
             <slider.commit_callback
               function="Pref.UpdateSliderText"
-              parameter="TreeMeshDetailText" />
+              parameter="AvatarPhysicsDetailText" />
           </slider>
           <text
             type="string"
@@ -646,74 +592,40 @@
             follows="left|top"
             height="16"
             layout="topleft"
-            name="TreeMeshDetailText"
             top_delta="0"
             left_delta="304"
+            name="AvatarPhysicsDetailText"
             width="128">
                Low
           </text>
 
           <slider
-            control_name="RenderVolumeLODFactor"
+            control_name="RenderAvatarMaxVisible"
+            decimal_digits="0"
             follows="left|top"
             height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Objects:"
+            increment="1"
+            initial_value="12"
+            label="Max. # of non-impostor avatars:"
             label_width="185"
             layout="topleft"
             left="30"
-            max_val="2"
-            name="ObjectMeshDetail"
-            show_text="false"
+            min_val="1"
+            max_val="65"
+            name="MaxNumberAvatarDrawn"
             top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="ObjectMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ObjectMeshDetailText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
+            width="325" />
 
-          <slider
-            control_name="RenderFlexTimeFactor"
-            follows="left|top"
+          <check_box
+            control_name="RenderUseImpostors"
             height="16"
-            initial_value="160"
-            label="Flexiprims:"
-            label_width="185"
+            initial_value="true"
+            label="Avatar impostors"
             layout="topleft"
             left="30"
-            name="FlexibleMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-	          function="Pref.UpdateSliderText"
-              parameter="FlexibleMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="FlexibleMeshDetailText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
+            name="AvatarImpostors"
+            top_delta="20"
+            width="300" />
 
           <text
             type="string"
@@ -804,26 +716,6 @@
             top_delta="16"
             width="280" />
 
-          <slider
-            control_name="RenderReflectionDetail"
-            follows="left|top"
-            height="16"
-            increment="1"
-            initial_value="2"
-            label="Water Reflections:"
-            label_width="165"
-            layout="topleft"
-            left="50"
-            min_val="0"
-            max_val="4"
-            name="Reflections"
-            show_text="false"
-            top_delta="16"
-            width="280">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="ReflectionsText" />
-          </slider>
           <text
             type="string"
             length="1"
@@ -832,11 +724,40 @@
             layout="topleft"
             name="ReflectionsText"
             text_readonly_color="LabelDisabledColor"
-            top_delta="0"
-            left_delta="284"
+            top_delta="16"
+            left="50"
             width="128">
-               Minimal
+               Water Reflections:
           </text>
+          <combo_box
+            control_name="RenderReflectionDetail"
+            height="18"
+            layout="topleft"
+            left_delta="170"
+            top_delta="0"
+            name="Reflections"
+            width="150">
+              <combo_box.item
+                label="Minimal"
+                name="0"
+                value="0"/>
+              <combo_box.item
+                label="Terrain and trees"
+                name="1"
+                value="1"/>
+              <combo_box.item
+                label="All static objects"
+                name="2"
+                value="2"/>
+              <combo_box.item
+                label="All avatars and objects"
+                name="3"
+                value="3"/>
+              <combo_box.item
+                label="Everything"
+                name="4"
+                value="4"/>
+          </combo_box>
 
           <check_box
             control_name="WindLightUseAtmosShaders"
@@ -929,25 +850,73 @@
               function="Pref.VertexShaderEnable" />
           </check_box>
 
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="90"
+            name="RenderShadowDetailText"
+            text_readonly_color="LabelDisabledColor"
+            top_delta="16"
+            width="128">
+              Shadows:
+          </text>
+          <combo_box
+           control_name="RenderShadowDetail"
+           height="18"
+           layout="topleft"
+           left_delta="130"
+           top_delta="0" 
+           name="ShadowDetail"
+           width="150">
+             <combo_box.item
+               label="None"
+               name="0"
+               value="0"/>
+             <combo_box.item
+               label="Sun/Moon"
+               name="1"
+               value="1"/>
+             <combo_box.item
+               label="Sun/Moon + Projectors"
+               name="2"
+               value="2"/>
+          </combo_box>
+
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="AvatarText"
+            top_delta="20"
+            left="5"
+            width="128">
+             Mesh
+          </text>
+
           <slider
-            control_name="RenderShadowDetail"
+            control_name="RenderTerrainLODFactor"
             follows="left|top"
             height="16"
-            increment="1"
-            initial_value="2"
-            label="Shadows:"
-            label_width="145"
+            increment="0.125"
+            initial_value="160"
+            label="Terrain Mesh Detail:"
+            label_width="185"
             layout="topleft"
-            left="70"
-            min_val="0"
+            left="30"
+            min_val="1"
             max_val="2"
-            name="ShadowDetail"
+            name="TerrainMeshDetail"
             show_text="false"
             top_delta="16"
-            width="260">
+            width="300">
             <slider.commit_callback
               function="Pref.UpdateSliderText"
-              parameter="RenderShadowDetailText" />
+              parameter="TerrainMeshDetailText" />
           </slider>
           <text
             type="string"
@@ -955,12 +924,105 @@
             follows="left|top"
             height="16"
             layout="topleft"
-            left_delta="264"
-            name="RenderShadowDetailText"
+            name="TerrainMeshDetailText"
             text_readonly_color="LabelDisabledColor"
             top_delta="0"
+            left_delta="304"
             width="128">
-              None
+               Low
+          </text>
+
+          <slider
+            control_name="RenderTreeLODFactor"
+            follows="left|top"
+            height="16"
+            increment="0.125"
+            initial_value="160"
+            label="Trees:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            name="TreeMeshDetail"
+            show_text="false"
+            top_delta="16"
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="TreeMeshDetailText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="TreeMeshDetailText"
+            top_delta="0"
+            left_delta="304"
+            width="128">
+               Low
+          </text>
+
+          <slider
+            control_name="RenderVolumeLODFactor"
+            follows="left|top"
+            height="16"
+            increment="0.125"
+            initial_value="160"
+            label="Objects:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            max_val="2"
+            name="ObjectMeshDetail"
+            show_text="false"
+            top_delta="16"
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="ObjectMeshDetailText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="ObjectMeshDetailText"
+            top_delta="0"
+            left_delta="304"
+            width="128">
+               Low
+          </text>
+
+          <slider
+            control_name="RenderFlexTimeFactor"
+            follows="left|top"
+            height="16"
+            initial_value="160"
+            label="Flexiprims:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            name="FlexibleMeshDetail"
+            show_text="false"
+            top_delta="16"
+            width="300">
+            <slider.commit_callback
+	          function="Pref.UpdateSliderText"
+              parameter="FlexibleMeshDetailText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="FlexibleMeshDetailText"
+            top_delta="0"
+            left_delta="304"
+            width="128">
+               Low
           </text>
 
           <text
@@ -976,7 +1038,6 @@
              Hardware
           </text>
 
-
           <slider
             control_name="TextureMemory"
             decimal_digits="0"