From b92dd27878c73d23dec9859b317babfde749b33b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 23 Nov 2014 12:11:51 -0500
Subject: STORM-2082 Allow saving and loading of graphic settings

---
 .../default/xui/en/panel_preferences_graphics1.xml | 1764 ++++++++++----------
 1 file changed, 903 insertions(+), 861 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 6c485c0595..72976deaed 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -9,905 +9,947 @@
  name="Display panel"
  top="1"
  width="517">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="30"
-     name="QualitySpeed"
-     top="10" 
-     width="400">
-        Quality and speed:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="right"
-     height="12"
-     layout="topleft"
-     left="35"
-     name="FasterText"
-     top_pad="4"
-     width="80">
-        Faster
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_delta="360"
-     name="BetterText"
-     top_delta="0"
-     width="100">
-        Better
-    </text>
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left="128"
-     name="LowGraphicsDivet"
-     top_delta="-2"
-     width="2" />
+   <string name="graphic_preset_combo_label">-Select a preset-</string>
+
+<!-- This block is always displayed -->
+  <text
+    follows="top|left|right"
+    font="SansSerif"
+    height="16"
+    layout="topleft"
+    left="5"
+    name="label"
+    top="10"
+    width="120">
+      Graphic Presets:
+  </text>
+  <combo_box
+   	allow_text_entry="true"
+   	follows="top|left"
+   	layout="topleft"
+   	left_pad="0"
+   	max_chars="100"
+   	name="graphic_preset_combo"
+   	top_delta="0"
+   	width="200"/>
+
+  <menu_button
+    follows="top|left"
+    height="24"
+    image_disabled="OptionsMenu_Disabled"
+    image_selected="OptionsMenu_Press"
+    image_unselected="OptionsMenu_Off"
+    layout="topleft"
+    left_pad="20"
+    menu_filename="menu_preferences_graphics_gear.xml"
+    name="gear_btn"
+    top_delta="0"
+    tool_tip="More options"
+    width="24" />
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left="30"
+    name="QualitySpeed"
+    top_delta="30" 
+    width="400">
+      Quality and speed:
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    halign="right"
+    height="12"
+    layout="topleft"
+    left="35"
+    name="FasterText"
+    top_pad="4"
+    width="80">
+      Faster
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_delta="360"
+    name="BetterText"
+    top_delta="0"
+    width="100">
+      Better
+  </text>
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left="128"
+    name="LowGraphicsDivet"
+    top_delta="-2"
+    width="2" />
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="LowMidGraphicsDivet"
+    width="2" />
   <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="LowMidGraphicsDivet"
-     width="2" />
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="MidGraphicsDivet"
-     top_delta="0"
-     width="2" />
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="MidGraphicsDivet"
+    top_delta="0"
+    width="2" />
   <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="MidHighGraphicsDivet"
-     top_delta="0"
-     width="2" />
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="HighGraphicsDivet"
-     top_delta="0"
-     width="2" />
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="MidHighGraphicsDivet"
+    top_delta="0"
+    width="2" />
   <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="HighUltraGraphicsDivet"
-     top_delta="0"
-     width="2" />
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="UltraGraphicsDivet"
-     top_delta="0"
-     width="2" />
-    <slider
-     control_name="RenderQualityPerformance"
-     decimal_digits="0"
-     follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="0"
-     layout="topleft"
-     left="120"
-     max_val="6"
-     name="QualityPerformanceSelection"
-     show_text="false"
-     top_delta="-2"
-     width="275">
-	 <slider.commit_callback
-			function="Pref.QualityPerformance"/>
-	</slider>		
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left="88"
-     name="ShadersPrefText"
-     top_delta="20"
-     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>
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="HighGraphicsDivet"
+    top_delta="0"
+    width="2" />
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="HighUltraGraphicsDivet"
+    top_delta="0"
+    width="2" />
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="UltraGraphicsDivet"
+    top_delta="0"
+    width="2" />
+  <slider
+    control_name="RenderQualityPerformance"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="0"
+    layout="topleft"
+    left="120"
+    max_val="6"
+    name="QualityPerformanceSelection"
+    show_text="false"
+    top_delta="-2"
+    width="275">
+    <slider.commit_callback
+	  function="Pref.QualityPerformance"/>
+	</slider>
+
+  <button
+    control_name="ShowAdvancedGraphicsSettings"
+    enabled_control="ShowAdvancedGraphicsSettings"
+    is_toggle="true"
+    follows="top|left"
+    height="23"
+    label="Basic Settings"
+    layout="topleft"
+    left="10"
+    name="Basic"
+    top_delta="25"
+    width="140" />
+  <button
+    control_name="ShowAdvancedGraphicsSettings"
+    disabled_control="ShowAdvancedGraphicsSettings"
+    is_toggle="true"
+    follows="top|left"
+    height="23"
+    label="Advanced Settings"
+    layout="topleft"
+    left_pad="5"
+    name="Advanced"
+    top_delta="0"
+    width="140" />
+<!--End of block that is always displayed -->
+
+<!-- Basic Settings or Advanced settings will be displayed at any given time, never both at once. -->
+<!-- This block shows Basic Settings -->
   <slider
-   control_name="RenderAvatarLODFactor"
-   invisiblity_control="ShowAdvancedGraphicsSettings"
-   follows="left|top"
-   height="16"
-   increment="0.125"
-   initial_value="160"
-   label="Avatar detail:"
-   label_width="90"
-   layout="topleft"
-   left="30"
-   name="AvatarMeshDetail2"
-   show_text="false"
-   top="72"
-   width="300">
+    control_name="RenderAvatarLODFactor"
+    invisibility_control="ShowAdvancedGraphicsSettings"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Avatar detail:"
+    label_width="90"
+    layout="topleft"
+    left="30"
+    name="AvatarMeshDetail2"
+    show_text="false"
+    top_delta="40"
+    width="300">
     <slider.commit_callback
-     function="Pref.UpdateSliderText"
-     parameter="AvatarMeshDetailText2" />
+      function="Pref.UpdateSliderText"
+      parameter="AvatarMeshDetailText2" />
   </slider>
   <text
-   type="string"
-   invisiblity_control="ShowAdvancedGraphicsSettings"
-   length="1"
-   follows="left|top"
-   height="12"
-   layout="topleft"
-   name="AvatarMeshDetailText2"
-   top_delta="0"
-   left_delta="304"
-   width="128">
-    Low
+    type="string"
+    invisibility_control="ShowAdvancedGraphicsSettings"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    name="AvatarMeshDetailText2"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+     Low
   </text>
+
   <slider
-   control_name="RenderFarClip"
-   invisiblity_control="ShowAdvancedGraphicsSettings"
-   decimal_digits="0"
-   follows="left|top"
-   height="16"
-   increment="8"
-   initial_value="160"
-   label="Draw distance:"
-   label_width="90"
-   layout="topleft"
-   left="30"
-   max_val="512"
-   min_val="64"
-   name="DrawDistance"
-   top="110"
-   width="330" />
+    control_name="RenderFarClip"
+    invisibility_control="ShowAdvancedGraphicsSettings"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label="Draw distance:"
+    label_width="90"
+    layout="topleft"
+    left="30"
+    min_val="64"
+    max_val="512"
+    name="DrawDistance"
+    top_delta="40"
+    width="330" />
   <text
-   type="string"
-   invisiblity_control="ShowAdvancedGraphicsSettings"
-   length="1"
-   follows="left|top"
-   height="12"
-   layout="topleft"
-   left_delta="330"
-   name="DrawDistanceMeterText2"
-   top_delta="0"
-   width="128">
-    m
+    type="string"
+    invisibility_control="ShowAdvancedGraphicsSettings"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_delta="330"
+    name="DrawDistanceMeterText2"
+    top_delta="0"
+    width="128">
+     m
   </text>
+
   <check_box
-		 control_name="RenderDeferred"
-     invisiblity_control="ShowAdvancedGraphicsSettings"
-		 height="16"
-		 initial_value="true"
-		 label="Advanced Lighting Model"
-		 layout="topleft"
-		 left="30"
-		 name="UseLightShaders2"
-		 top="148"
-		 width="256">
+    control_name="RenderDeferred"
+    invisibility_control="ShowAdvancedGraphicsSettings"
+    height="16"
+    initial_value="true"
+    label="Advanced Lighting Model"
+    layout="topleft"
+    left="30"
+    name="UseLightShaders2"
+    top_delta="40"
+    width="256">
     <check_box.commit_callback
       function="Pref.VertexShaderEnable" />
   </check_box>
+<!-- End of Basic Settings block -->
+
+<!-- This block shows Advanced Settings -->
+  <scroll_container
+    visibility_control="ShowAdvancedGraphicsSettings"
+    follows="top|left"
+    height="270"
+    label="CustomGraphics"
+    layout="topleft"
+    left="5"
+    name="CustomGraphics Scroll"
+    reserve_scroll_corner="true"
+    top="106"
+    width="500">
+
     <panel
-	   visiblity_control="ShowAdvancedGraphicsSettings"
-     border="false"
-	   follows="top|left"
-     height="300"
-     label="CustomGraphics"
-     layout="topleft"
-     left="5"
-     name="CustomGraphics Panel"
-     top="76"
-     width="485">
-		<text
-		 type="string"
-		 length="1"
-		 follows="left|top"
-		 height="12"
-		 layout="topleft"
-		 left_delta="5"
-		 name="ShadersText"
-		 top="3"
-		 width="128">
-			Shaders:
-		</text>
-		<check_box
-		 control_name="RenderTransparentWater"
-		 height="16"
-		 initial_value="true"
-		 label="Transparent Water"
-		 layout="topleft"
-		 left_delta="0"
-		 name="TransparentWater"
-		 top_pad="7"
-		 width="256" />
+      visibility_control="ShowAdvancedGraphicsSettings"
+      border="false"
+	  follows="top|left"
+      height="600"
+      label="CustomGraphics"
+      layout="topleft"
+      left="5"
+      name="CustomGraphics Panel"
+      top="106"
+      width="485">
+
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="AvatarText"
+        top="10"
+        left="5"
+        width="128">
+         Avatar
+      </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="20"
+        width="325" />
+
       <check_box
-       control_name="RenderObjectBump"
-       height="16"
-       initial_value="true"
-       label="Bump mapping and shiny"
-       layout="topleft"
-       left_delta="0"
-       name="BumpShiny"
-       top_pad="1"
-      width="256">
+        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="40"
+        left="5"
+        width="128">
+         Mesh
+      </text>
+
+      <slider
+        control_name="RenderTerrainLODFactor"
+        follows="left|top"
+        height="16"
+        increment="0.125"
+        initial_value="160"
+        label="Terrain Mesh Detail:"
+        label_width="185"
+        layout="topleft"
+        left="30"
+        min_val="1"
+        max_val="2"
+        name="TerrainMeshDetail"
+        show_text="false"
+        top_delta="16"
+        width="300">
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="TerrainMeshDetailText" />
+      </slider>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="TerrainMeshDetailText"
+        top_delta="0"
+        left_delta="304"
+        width="128">
+           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
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="OtherText"
+        top_delta="40"
+        left="5"
+        width="128">
+         Other
+      </text>
+
+      <slider
+        control_name="RenderFarClip"
+        decimal_digits="0"
+        follows="left|top"
+        height="16"
+        increment="8"
+        initial_value="160"
+        label="Draw distance:"
+        label_width="185"
+        layout="topleft"
+        left="30"
+        min_val="64"
+        max_val="512"
+        name="DrawDistance"
+        top_delta="16"
+        width="330" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="DrawDistanceMeterText2"
+        top_delta="0"
+        left_delta="330"
+        width="102">
+          m
+      </text> 
+
+      <slider
+        control_name="RenderMaxPartCount"
+        decimal_digits="0"
+        follows="left|top"
+        height="16"
+        increment="256"
+        initial_value="4096"
+        label="Max. particle count:"
+        label_width="185"
+        layout="topleft"
+        left="30"
+        max_val="8192"
+        name="MaxParticleCount"
+        top_delta="16"
+        width="336" />
+
+      <slider
+        control_name="RenderGlowResolutionPow"
+        decimal_digits="0"
+        follows="left|top"
+        height="16"
+        increment="1"
+        initial_value="8"
+        label="Post process quality:"
+        label_width="185"
+        layout="topleft"
+        left="30"
+        min_val="8"
+        max_val="9"
+        name="RenderPostProcess"
+        show_text="false"
+        top_delta="16"
+        width="300">
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="PostProcessText" />
+      </slider>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="PostProcessText"
+        top_delta="0"
+        left_delta="304"
+        width="128">
+           Low
+      </text>
+
+      <slider
+        control_name="RenderTerrainDetail"
+        follows="left|top"
+        height="16"
+        label="Terrain Detail:"
+        label_width="185"
+        layout="topleft"
+        left="30"
+        show_text="false"
+        initial_value="0"
+        increment="1"
+        min_val="0"
+        max_val="1"
+        name="TerrainDetail"
+        top_delta="16"
+        width="300" >
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="TerrainDetailText" />
+      </slider>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        top_delta="0"
+        left_delta="304"
+        name="TerrainDetailText"
+        width="128">
+           Low
+      </text>
+
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="ShadersText"
+        top_delta="40"
+        left="5"
+        width="128">
+         Shaders
+      </text>
+
+      <check_box
+        control_name="RenderTransparentWater"
+        height="16"
+        initial_value="true"
+        label="Transparent Water"
+        layout="topleft"
+        left="30"
+        name="TransparentWater"
+        top_delta="16"
+        width="300" />
+
+      <check_box
+        control_name="RenderObjectBump"
+        height="16"
+        initial_value="true"
+        label="Bump mapping and shiny"
+        layout="topleft"
+        left="30"
+        name="BumpShiny"
+        top_delta="16"
+        width="300">
         <check_box.commit_callback
-        function="Pref.VertexShaderEnable" />
+          function="Pref.VertexShaderEnable" />
       </check_box>
-    <check_box
-		 control_name="RenderLocalLights"
-		 height="16"
-		 initial_value="true"
-		 label="Local Lights"
-		 layout="topleft"
-		 left_delta="0"
-		 name="LocalLights"
-		 top_pad="1"
-		 width="256" />
-		  <check_box
-		 control_name="VertexShaderEnable"
-		 height="16"
-		 initial_value="true"
-		 label="Basic shaders"
-		 layout="topleft"
-		 left_delta="0"
-		 name="BasicShaders"
-		 tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
-		 top_pad="1"
-		 width="315">
-			<check_box.commit_callback
-		     function="Pref.VertexShaderEnable" />
-		</check_box>
-		<check_box
-		 control_name="WindLightUseAtmosShaders"
-		 height="16"
-		 initial_value="true"
-		 label="Atmospheric shaders"
-		 layout="topleft"
-		 left_delta="0"
-		 name="WindLightUseAtmosShaders"
-		 top_pad="1"
-		 width="256">
-			<check_box.commit_callback
-			 function="Pref.VertexShaderEnable" />
-		</check_box>
-    	<check_box
-		 control_name="RenderDeferred"
-		 height="16"
-		 initial_value="true"
-		 label="Advanced Lighting Model"
-		 layout="topleft"
-		 left_delta="0"
-		 name="UseLightShaders"
-		 top_pad="1"
-		 width="256">
-         	<check_box.commit_callback
-			 function="Pref.VertexShaderEnable" />
-    	</check_box>
-    	<check_box
-		 control_name="RenderDeferredSSAO"
-		 height="16"
-		 initial_value="true"
-		 label="Ambient Occlusion"
-		 layout="topleft"
-		 left_delta="0"
-		 name="UseSSAO"
-		 top_pad="1"
-		 width="256">
-         	<check_box.commit_callback
-			 function="Pref.VertexShaderEnable" />
-    	</check_box>
+
       <check_box
-		 control_name="RenderDepthOfField"
-		 height="16"
-		 initial_value="true"
-		 label="Depth of Field"
-		 layout="topleft"
-		 left_delta="0"
-		 name="UseDoF"
-		 top_pad="1"
-		 width="256">
+        control_name="RenderLocalLights"
+        height="16"
+        initial_value="true"
+        label="Local Lights"
+        layout="topleft"
+        left="30"
+        name="LocalLights"
+        top_delta="16"
+        width="300" />
+
+      <check_box
+        control_name="VertexShaderEnable"
+        height="16"
+        initial_value="true"
+        label="Basic shaders"
+        layout="topleft"
+        left="30"
+        name="BasicShaders"
+        tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
+        top_delta="16"
+        width="300">
         <check_box.commit_callback
-     function="Pref.VertexShaderEnable" />
+          function="Pref.VertexShaderEnable" />
       </check_box>
 
-        <text
-         type="string"
-         length="1"
-         top_pad="8"
-         follows="top|left"
-         height="23"
-         width="110"
-         word_wrap="true"
-         layout="topleft"
-         left="10"
-         name="shadows_label">
-         	Shadows:
-        </text>
-        <combo_box
-         control_name="RenderShadowDetail"
-         height="23"
-         layout="topleft"
-         left="10"
-         top_pad="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"
-         top_pad="8"
-         follows="top|left"
-         height="12"
-         width="110"
-         word_wrap="true"
-         layout="topleft"
-         left="05"
-         name="reflection_label">
-            Water Reflections:
-        </text>
-        <combo_box
-         control_name="RenderReflectionDetail"
-         height="18"
-         layout="topleft"
-         left_delta="10"
-         top_pad ="3"
-         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>
-    
-        <slider
-        control_name="RenderAvatarPhysicsLODFactor"
+      <check_box
+        control_name="RenderAvatarVP"
+        height="16"
+        initial_value="true"
+        label="Avatar Hardware skinning"
+        layout="topleft"
+        left="50"
+        name="AvatarVertexProgram"
+        top_delta="16"
+        width="280">
+        <check_box.commit_callback
+          function="Pref.VertexShaderEnable" />
+      </check_box>
+
+      <check_box
+        control_name="RenderAvatarCloth"
+        height="16"
+        initial_value="true"
+        label="Avatar cloth"
+        layout="topleft"
+        left="50"
+        name="AvatarCloth"
+        top_delta="16"
+        width="280" />
+
+      <slider
+        control_name="RenderReflectionDetail"
         follows="left|top"
         height="16"
-        initial_value="100"
-	increment=".05"
-        label="  Avatar Physics:"
-        label_width="85"
+        increment="1"
+        initial_value="2"
+        label="Water Reflections:"
+        label_width="165"
         layout="topleft"
-        left_delta="-16"
-        name="AvatarPhysicsDetail"
+        left="50"
+        min_val="0"
+        max_val="4"
+        name="Reflections"
         show_text="false"
-        top_pad="12"
-        width="160">
-           <slider.commit_callback
-            function="Pref.UpdateSliderText"
-            parameter="AvatarPhysicsDetailText" />
-        </slider>
-        <text
+        top_delta="16"
+        width="280">
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="ReflectionsText" />
+      </slider>
+      <text
         type="string"
         length="1"
         follows="left|top"
-        height="12"
+        height="16"
         layout="topleft"
-        left_delta="165"
-        name="AvatarPhysicsDetailText"
-        top_pad="-16"
+        name="ReflectionsText"
+        top_delta="0"
+        left_delta="284"
+        width="128">
+           Minimal
+      </text>
+
+      <check_box
+        control_name="WindLightUseAtmosShaders"
+        height="16"
+        initial_value="true"
+        label="Atmospheric shaders"
+        layout="topleft"
+        left="50"
+        name="WindLightUseAtmosShaders"
+        top_delta="16"
+        width="280">
+        <check_box.commit_callback
+          function="Pref.VertexShaderEnable" />
+      </check_box>
+
+      <slider
+        control_name="WLSkyDetail"
+        enabled_control="WindLightUseAtmosShaders"
+        decimal_digits="0"
+        follows="left|top"
+        height="16"
+        increment="8"
+        initial_value="160"
+        label="Sky:"
+        label_width="145"
+        layout="topleft"
+        left="70"
+        min_val="16"
+        max_val="128"
+        name="SkyMeshDetail"
+        show_text="false"
+        top_delta="16"
+        width="260">
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="SkyMeshDetailText" />
+      </slider>
+      <text
+        enabled_control="WindLightUseAtmosShaders"
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left_delta="264"
+        name="SkyMeshDetailText"
+        top_delta="0"
         width="128">
            Low
-        </text>
-
-		<slider
-		 control_name="RenderFarClip"
-		 decimal_digits="0"
-		 follows="left|top"
-		 height="16"
-		 increment="8"
-		 initial_value="160"
-		 label="Draw distance:"
-		 label_width="185"
-		 layout="topleft"
-		 left="200"
-		 max_val="512"
-		 min_val="64"
-		 name="DrawDistance"
-		 top="3"
-		 width="296" />
-		<text
-		 type="string"
-		 length="1"
-		 follows="left|top"
-		 height="12"
-		 layout="topleft"
-		 left_delta="291"
-		 name="DrawDistanceMeterText2"
-		 top_delta="0"
-		 width="128">
-			m
-		</text>    
-		<slider
-		 control_name="RenderMaxPartCount"
-		 decimal_digits="0"
-		 follows="left|top"
-		 height="16"
-		 increment="256"
-		 initial_value="4096"
-		 label="Max. particle count:"
-		 label_width="185"
-		 layout="topleft"
-		 left="200"
-		 max_val="8192"
-		 name="MaxParticleCount"
-		 top_pad="7"
-		 width="303" />
-        <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_delta="0"
-         max_val="65"
-         min_val="1"
-         name="MaxNumberAvatarDrawn"
-         top_pad="4"
-         width="290" />
-		<slider
- 		 control_name="RenderGlowResolutionPow"
-		 decimal_digits="0"
-		 follows="left|top"
-		 height="16"
-		 increment="1"
-		 initial_value="8"
-		 label="Post process quality:"
-		 label_width="185"
-		 layout="topleft"
-		 left="200"
-		 max_val="9"
-		 min_val="8"
-		 name="RenderPostProcess"
-		 show_text="false"
-		 top_pad="4"
-		 width="264">
-			<slider.commit_callback
-			 function="Pref.UpdateSliderText"
-			 parameter="PostProcessText" />
-		</slider>
-		<text
-		 type="string"
-		 length="1"
-		 follows="left|top"
-		 height="12"
-		 layout="topleft"
-		 left_delta="0"
-		 name="MeshDetailText"
-		 top_pad="5"
-		 width="128">
-			Mesh detail:
-		</text>
-		<slider
-		 control_name="RenderVolumeLODFactor"
-		 follows="left|top"
-		 height="16"
-		 increment="0.125"
-		 initial_value="160"
-		 label="  Objects:"
-		 label_width="185"
-		 layout="topleft"
-		 left_delta="0"
-		 max_val="2"
-		 name="ObjectMeshDetail"
-		 show_text="false"
-		 top_pad="6"
-		 width="264">
-			<slider.commit_callback
-			 function="Pref.UpdateSliderText"
-			 parameter="ObjectMeshDetailText" />
-		</slider>
-		<slider
-		 control_name="RenderFlexTimeFactor"
-		 follows="left|top"
-		 height="16"
-		 initial_value="160"
-		 label="  Flexiprims:"
-		 label_width="185"
-		 layout="topleft"
-		 left_delta="0"
-		 name="FlexibleMeshDetail"
-		 show_text="false"
-		 top_pad="4"
-		 width="264">
-			<slider.commit_callback
-			 function="Pref.UpdateSliderText"
-			 parameter="FlexibleMeshDetailText" />
-		</slider>
-        <slider
-         control_name="RenderTreeLODFactor"
-         follows="left|top"
-         height="16"
-         increment="0.125"
-         initial_value="160"
-         label="  Trees:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         name="TreeMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="TreeMeshDetailText" />
-            </slider>
-        <slider
-         control_name="RenderAvatarLODFactor"
-         follows="left|top"
-         height="16"
-         increment="0.125"
-         initial_value="160"
-         label="  Avatars:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         name="AvatarMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="AvatarMeshDetailText" />
-        </slider>
-        <slider
-         control_name="RenderTerrainLODFactor"
-         follows="left|top"
-         height="16"
-         increment="0.125"
-         initial_value="160"
-         label="  Terrain:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         max_val="2"
-         min_val="1"
-         name="TerrainMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="TerrainMeshDetailText" />
-        </slider>
-        <slider
-         control_name="WLSkyDetail"
-		 enabled_control="WindLightUseAtmosShaders"
-         decimal_digits="0"
-         follows="left|top"
-         height="16"
-         increment="8"
-         initial_value="160"
-         label="  Sky:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         max_val="128"
-         min_val="16"
-         name="SkyMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="SkyMeshDetailText" />
-        </slider>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left="469"
-         name="PostProcessText"
-         top="60"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="ObjectMeshDetailText"
-         top_pad="26"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="FlexibleMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="TreeMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="AvatarMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="TerrainMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-		 enabled_control="WindLightUseAtmosShaders"
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="SkyMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="-260"
-         name="AvatarRenderingText"
-         top_pad="18"
-         width="128">
-        Avatar Rendering:
       </text>
+
       <check_box
-       control_name="RenderUseImpostors"
-       height="16"
-       initial_value="true"
-       label="Avatar impostors"
-       layout="topleft"
-       left_delta="0"
-       name="AvatarImpostors"
-       top_pad="7"
-       width="256" />
+        control_name="RenderDeferred"
+        height="16"
+        initial_value="true"
+        label="Advanced Lighting Model"
+        layout="topleft"
+        left="70"
+        name="UseLightShaders"
+        top_delta="16"
+        width="260">
+        <check_box.commit_callback
+          function="Pref.VertexShaderEnable" />
+      </check_box>
+
       <check_box
-       control_name="RenderAvatarVP"
-       height="16"
-       initial_value="true"
-       label="Hardware skinning"
-       layout="topleft"
-       left_delta="0"
-       name="AvatarVertexProgram"
-       top_pad="1"
-       width="256">
-          <check_box.commit_callback
-           function="Pref.VertexShaderEnable" />
+        control_name="RenderDeferredSSAO"
+        height="16"
+        initial_value="true"
+        label="Ambient Occlusion"
+        layout="topleft"
+        left="90"
+        name="UseSSAO"
+        top_delta="16"
+        width="240">
+        <check_box.commit_callback
+          function="Pref.VertexShaderEnable" />
       </check_box>
+
       <check_box
-       control_name="RenderAvatarCloth"
-       height="16"
-       initial_value="true"
-       label="Avatar cloth"
-       layout="topleft"
-       left_delta="0"
-       name="AvatarCloth"
-       top_pad="1"
-       width="256" />
+        control_name="RenderDepthOfField"
+        height="16"
+        initial_value="true"
+        label="Depth of Field"
+        layout="topleft"
+        left="90"
+        name="UseDoF"
+        top_delta="16"
+        width="240">
+        <check_box.commit_callback
+          function="Pref.VertexShaderEnable" />
+      </check_box>
+
+      <slider
+        control_name="RenderShadowDetail"
+        follows="left|top"
+        height="16"
+        increment="1"
+        initial_value="2"
+        label="Shadows:"
+        label_width="145"
+        layout="topleft"
+        left="70"
+        min_val="0"
+        max_val="2"
+        name="RenderShadowDetail"
+        show_text="false"
+        top_delta="16"
+        width="260">
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="RenderShadowDetailText" />
+      </slider>
       <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="12"
-       layout="topleft"
-       left="407"
-       left_pad="-30"
-       name="TerrainDetailText"
-        top="250"
-       width="155">
-          Terrain detail:
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left_delta="264"
+        name="RenderShadowDetailText"
+        top_delta="0"
+        width="128">
+          None
       </text>
-      <radio_group
-       control_name="RenderTerrainDetail"
-       draw_border="false"
-       height="38"
-       layout="topleft"
-       left_delta="5"
-       name="TerrainDetailRadio"
-       top_pad="5"
-       width="70">
-          <radio_item
-           height="16"
-           label="Low"
-           layout="topleft"
-           name="0"
-           top="3"
-           width="50" />
-          <radio_item
-           height="16"
-           label="High"
-           layout="topleft"
-           name="2"
-           top_delta="16"
-           width="50" />
-      </radio_group> -->
-	</panel>
-	
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Apply"
-     label_selected="Apply"
-     layout="topleft"
-     left="10"
-     name="Apply"
-     top="390"
-     width="115">
-        <button.commit_callback
-         function="Pref.Apply" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Reset"
-     layout="topleft"
-     left_pad="3"
-     name="Defaults"
-     top="390"
-     width="115">
-        <button.commit_callback
-         function="Pref.HardwareDefaults" />
-    </button>
-    <button
-     control_name="ShowAdvancedGraphicsSettings"
-     follows="right|bottom"
-     height="23"
-     is_toggle="true"
-     label="Advanced"
-     layout="topleft"
-     left_pad="35"
-     name="Advanced"
-     top_delta="0"
-     width="115" />
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Hardware"
-     label_selected="Hardware"
-     layout="topleft"
-     left_pad="3"
-     name="GraphicsHardwareButton"
-     top_delta="0"
-     width="115">
-        <button.commit_callback
-         function="Pref.HardwareSettings" />
-    </button>
+    </panel>
+  </scroll_container>
+<!-- End of Advanced Settings block -->
+
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Apply"
+    label_selected="Apply"
+    layout="topleft"
+    left="10"
+    name="Apply"
+    top="390"
+    width="115">
+    <button.commit_callback
+      function="Pref.Apply" />
+  </button>
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Reset"
+    layout="topleft"
+    left_pad="5"
+    name="Defaults"
+    top="390"
+    width="115">
+    <button.commit_callback
+      function="Pref.HardwareDefaults" />
+  </button>
+  <button
+    follows="right|bottom"
+    height="23"
+    label="Hardware"
+    label_selected="Hardware"
+    layout="topleft"
+    left_pad="150"
+    name="GraphicsHardwareButton"
+    top="390"
+    width="115">
+    <button.commit_callback
+      function="Pref.HardwareSettings" />
+  </button>
 </panel>
-- 
cgit v1.2.3


From 42821c7c54ff2eed5327262bf26b28ad429ee1d3 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 25 Nov 2014 09:02:28 -0500
Subject: STORM-2082 Small fix for button highlighting issue

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 72976deaed..955c0f1a41 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -168,6 +168,7 @@
     control_name="ShowAdvancedGraphicsSettings"
     enabled_control="ShowAdvancedGraphicsSettings"
     is_toggle="true"
+    image_selected="PushButton_Off"
     follows="top|left"
     height="23"
     label="Basic Settings"
@@ -180,6 +181,7 @@
     control_name="ShowAdvancedGraphicsSettings"
     disabled_control="ShowAdvancedGraphicsSettings"
     is_toggle="true"
+    image_disabled_selected="PushButton_Disabled"
     follows="top|left"
     height="23"
     label="Advanced Settings"
-- 
cgit v1.2.3


From ea0216f67c12195aadb1993180c28c43b04294bd Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 25 Nov 2014 16:33:53 -0500
Subject: STORM-2082 Add tab containers, remove buttons and obsolete debug
 setting

---
 .../default/xui/en/panel_preferences_graphics1.xml | 1467 ++++++++++----------
 1 file changed, 747 insertions(+), 720 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 955c0f1a41..0a7cc995c7 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -20,8 +20,8 @@
     left="5"
     name="label"
     top="10"
-    width="120">
-      Graphic Presets:
+    width="60">
+      Presets:
   </text>
   <combo_box
    	allow_text_entry="true"
@@ -32,21 +32,30 @@
    	name="graphic_preset_combo"
    	top_delta="0"
    	width="200"/>
-
-  <menu_button
+  <button
     follows="top|left"
-    height="24"
-    image_disabled="OptionsMenu_Disabled"
-    image_selected="OptionsMenu_Press"
-    image_unselected="OptionsMenu_Off"
+    height="23"
+    label="Save As..."
     layout="topleft"
-    left_pad="20"
-    menu_filename="menu_preferences_graphics_gear.xml"
-    name="gear_btn"
+    left_pad="5"
+    name="PrefSaveAsButton"
     top_delta="0"
-    tool_tip="More options"
-    width="24" />
-
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefSaveAs" />
+  </button>
+  <button
+    follows="top|left"
+    height="23"
+    label="Delete"
+    layout="topleft"
+    left_pad="5"
+    name="PrefDeleteButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefDelete" />
+  </button>
   <text
     type="string"
     length="1"
@@ -161,156 +170,35 @@
     top_delta="-2"
     width="275">
     <slider.commit_callback
-	  function="Pref.QualityPerformance"/>
-	</slider>
+      function="Pref.QualityPerformance"/>
+  </slider>
 
-  <button
-    control_name="ShowAdvancedGraphicsSettings"
-    enabled_control="ShowAdvancedGraphicsSettings"
-    is_toggle="true"
-    image_selected="PushButton_Off"
-    follows="top|left"
-    height="23"
-    label="Basic Settings"
-    layout="topleft"
-    left="10"
-    name="Basic"
-    top_delta="25"
-    width="140" />
-  <button
-    control_name="ShowAdvancedGraphicsSettings"
-    disabled_control="ShowAdvancedGraphicsSettings"
-    is_toggle="true"
-    image_disabled_selected="PushButton_Disabled"
-    follows="top|left"
-    height="23"
-    label="Advanced Settings"
-    layout="topleft"
-    left_pad="5"
-    name="Advanced"
-    top_delta="0"
-    width="140" />
 <!--End of block that is always displayed -->
 
-<!-- Basic Settings or Advanced settings will be displayed at any given time, never both at once. -->
-<!-- This block shows Basic Settings -->
-  <slider
-    control_name="RenderAvatarLODFactor"
-    invisibility_control="ShowAdvancedGraphicsSettings"
-    follows="left|top"
-    height="16"
-    increment="0.125"
-    initial_value="160"
-    label="Avatar detail:"
-    label_width="90"
-    layout="topleft"
-    left="30"
-    name="AvatarMeshDetail2"
-    show_text="false"
-    top_delta="40"
-    width="300">
-    <slider.commit_callback
-      function="Pref.UpdateSliderText"
-      parameter="AvatarMeshDetailText2" />
-  </slider>
-  <text
-    type="string"
-    invisibility_control="ShowAdvancedGraphicsSettings"
-    length="1"
-    follows="left|top"
-    height="12"
-    layout="topleft"
-    name="AvatarMeshDetailText2"
-    top_delta="0"
-    left_delta="304"
-    width="128">
-     Low
-  </text>
-
-  <slider
-    control_name="RenderFarClip"
-    invisibility_control="ShowAdvancedGraphicsSettings"
-    decimal_digits="0"
-    follows="left|top"
-    height="16"
-    increment="8"
-    initial_value="160"
-    label="Draw distance:"
-    label_width="90"
-    layout="topleft"
-    left="30"
-    min_val="64"
-    max_val="512"
-    name="DrawDistance"
-    top_delta="40"
-    width="330" />
-  <text
-    type="string"
-    invisibility_control="ShowAdvancedGraphicsSettings"
-    length="1"
+  <tab_container
     follows="left|top"
-    height="12"
-    layout="topleft"
-    left_delta="330"
-    name="DrawDistanceMeterText2"
-    top_delta="0"
-    width="128">
-     m
-  </text>
-
-  <check_box
-    control_name="RenderDeferred"
-    invisibility_control="ShowAdvancedGraphicsSettings"
-    height="16"
-    initial_value="true"
-    label="Advanced Lighting Model"
-    layout="topleft"
-    left="30"
-    name="UseLightShaders2"
-    top_delta="40"
-    width="256">
-    <check_box.commit_callback
-      function="Pref.VertexShaderEnable" />
-  </check_box>
-<!-- End of Basic Settings block -->
+    height="400"
+    halign="center"
+    left="0"
+    name="PreferencesGraphicsTabs"
+    tab_max_width="300"
+    tab_min_width="40"
+    tab_position="top"
+    tab_height="25"
+    top_delta="25"
+    width="517">
 
-<!-- This block shows Advanced Settings -->
-  <scroll_container
-    visibility_control="ShowAdvancedGraphicsSettings"
-    follows="top|left"
-    height="270"
-    label="CustomGraphics"
-    layout="topleft"
-    left="5"
-    name="CustomGraphics Scroll"
-    reserve_scroll_corner="true"
-    top="106"
-    width="500">
 
+<!-- This block shows Basic Settings -->
     <panel
-      visibility_control="ShowAdvancedGraphicsSettings"
       border="false"
-	  follows="top|left"
-      height="600"
-      label="CustomGraphics"
+      follows="all"
+      label="Basic Settings"
       layout="topleft"
-      left="5"
-      name="CustomGraphics Panel"
-      top="106"
-      width="485">
-
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        name="AvatarText"
-        top="10"
-        left="5"
-        width="128">
-         Avatar
-      </text>
+      mouse_opaque="false"
+      name="Basic"
+      top="30"
+      width="517">
 
       <slider
         control_name="RenderAvatarLODFactor"
@@ -318,240 +206,29 @@
         height="16"
         increment="0.125"
         initial_value="160"
-        label="Detail:"
-        label_width="185"
+        label="Avatar detail:"
+        label_width="90"
         layout="topleft"
         left="30"
-        name="AvatarMeshDetail"
+        name="AvatarMeshDetail2"
         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" />
+          parameter="AvatarMeshDetailText2" />
       </slider>
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="16"
+        height="12"
         layout="topleft"
+        name="AvatarMeshDetailText2"
         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="20"
-        width="325" />
-
-      <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="40"
-        left="5"
-        width="128">
-         Mesh
-      </text>
-
-      <slider
-        control_name="RenderTerrainLODFactor"
-        follows="left|top"
-        height="16"
-        increment="0.125"
-        initial_value="160"
-        label="Terrain Mesh Detail:"
-        label_width="185"
-        layout="topleft"
-        left="30"
-        min_val="1"
-        max_val="2"
-        name="TerrainMeshDetail"
-        show_text="false"
-        top_delta="16"
-        width="300">
-        <slider.commit_callback
-          function="Pref.UpdateSliderText"
-          parameter="TerrainMeshDetailText" />
-      </slider>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        name="TerrainMeshDetailText"
-        top_delta="0"
-        left_delta="304"
-        width="128">
-           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
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        name="OtherText"
-        top_delta="40"
-        left="5"
         width="128">
-         Other
+         Low
       </text>
 
       <slider
@@ -562,159 +239,27 @@
         increment="8"
         initial_value="160"
         label="Draw distance:"
-        label_width="185"
+        label_width="90"
         layout="topleft"
         left="30"
         min_val="64"
         max_val="512"
         name="DrawDistance"
-        top_delta="16"
+        top_delta="30"
         width="330" />
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="16"
+        height="12"
         layout="topleft"
-        name="DrawDistanceMeterText2"
-        top_delta="0"
         left_delta="330"
-        width="102">
-          m
-      </text> 
-
-      <slider
-        control_name="RenderMaxPartCount"
-        decimal_digits="0"
-        follows="left|top"
-        height="16"
-        increment="256"
-        initial_value="4096"
-        label="Max. particle count:"
-        label_width="185"
-        layout="topleft"
-        left="30"
-        max_val="8192"
-        name="MaxParticleCount"
-        top_delta="16"
-        width="336" />
-
-      <slider
-        control_name="RenderGlowResolutionPow"
-        decimal_digits="0"
-        follows="left|top"
-        height="16"
-        increment="1"
-        initial_value="8"
-        label="Post process quality:"
-        label_width="185"
-        layout="topleft"
-        left="30"
-        min_val="8"
-        max_val="9"
-        name="RenderPostProcess"
-        show_text="false"
-        top_delta="16"
-        width="300">
-        <slider.commit_callback
-          function="Pref.UpdateSliderText"
-          parameter="PostProcessText" />
-      </slider>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        name="PostProcessText"
-        top_delta="0"
-        left_delta="304"
-        width="128">
-           Low
-      </text>
-
-      <slider
-        control_name="RenderTerrainDetail"
-        follows="left|top"
-        height="16"
-        label="Terrain Detail:"
-        label_width="185"
-        layout="topleft"
-        left="30"
-        show_text="false"
-        initial_value="0"
-        increment="1"
-        min_val="0"
-        max_val="1"
-        name="TerrainDetail"
-        top_delta="16"
-        width="300" >
-        <slider.commit_callback
-          function="Pref.UpdateSliderText"
-          parameter="TerrainDetailText" />
-      </slider>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
-        layout="topleft"
+        name="DrawDistanceMeterText2"
         top_delta="0"
-        left_delta="304"
-        name="TerrainDetailText"
-        width="128">
-           Low
-      </text>
-
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        name="ShadersText"
-        top_delta="40"
-        left="5"
         width="128">
-         Shaders
+         m
       </text>
 
-      <check_box
-        control_name="RenderTransparentWater"
-        height="16"
-        initial_value="true"
-        label="Transparent Water"
-        layout="topleft"
-        left="30"
-        name="TransparentWater"
-        top_delta="16"
-        width="300" />
-
-      <check_box
-        control_name="RenderObjectBump"
-        height="16"
-        initial_value="true"
-        label="Bump mapping and shiny"
-        layout="topleft"
-        left="30"
-        name="BumpShiny"
-        top_delta="16"
-        width="300">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
-
-      <check_box
-        control_name="RenderLocalLights"
-        height="16"
-        initial_value="true"
-        label="Local Lights"
-        layout="topleft"
-        left="30"
-        name="LocalLights"
-        top_delta="16"
-        width="300" />
-
       <check_box
         control_name="VertexShaderEnable"
         height="16"
@@ -724,234 +269,716 @@
         left="30"
         name="BasicShaders"
         tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
-        top_delta="16"
+        top_delta="30"
         width="300">
         <check_box.commit_callback
           function="Pref.VertexShaderEnable" />
       </check_box>
 
-      <check_box
-        control_name="RenderAvatarVP"
-        height="16"
-        initial_value="true"
-        label="Avatar Hardware skinning"
-        layout="topleft"
-        left="50"
-        name="AvatarVertexProgram"
-        top_delta="16"
-        width="280">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
-
-      <check_box
-        control_name="RenderAvatarCloth"
-        height="16"
-        initial_value="true"
-        label="Avatar cloth"
-        layout="topleft"
-        left="50"
-        name="AvatarCloth"
-        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"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        name="ReflectionsText"
-        top_delta="0"
-        left_delta="284"
-        width="128">
-           Minimal
-      </text>
-
-      <check_box
-        control_name="WindLightUseAtmosShaders"
-        height="16"
-        initial_value="true"
-        label="Atmospheric shaders"
-        layout="topleft"
-        left="50"
-        name="WindLightUseAtmosShaders"
-        top_delta="16"
-        width="280">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
-
-      <slider
-        control_name="WLSkyDetail"
-        enabled_control="WindLightUseAtmosShaders"
-        decimal_digits="0"
-        follows="left|top"
-        height="16"
-        increment="8"
-        initial_value="160"
-        label="Sky:"
-        label_width="145"
-        layout="topleft"
-        left="70"
-        min_val="16"
-        max_val="128"
-        name="SkyMeshDetail"
-        show_text="false"
-        top_delta="16"
-        width="260">
-        <slider.commit_callback
-          function="Pref.UpdateSliderText"
-          parameter="SkyMeshDetailText" />
-      </slider>
-      <text
-        enabled_control="WindLightUseAtmosShaders"
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-        left_delta="264"
-        name="SkyMeshDetailText"
-        top_delta="0"
-        width="128">
-           Low
-      </text>
-
       <check_box
         control_name="RenderDeferred"
         height="16"
         initial_value="true"
         label="Advanced Lighting Model"
         layout="topleft"
-        left="70"
-        name="UseLightShaders"
-        top_delta="16"
-        width="260">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
-
-      <check_box
-        control_name="RenderDeferredSSAO"
-        height="16"
-        initial_value="true"
-        label="Ambient Occlusion"
-        layout="topleft"
-        left="90"
-        name="UseSSAO"
-        top_delta="16"
-        width="240">
+        left="50"
+        name="UseLightShaders2"
+        top_delta="20"
+        width="256">
         <check_box.commit_callback
           function="Pref.VertexShaderEnable" />
       </check_box>
+    </panel>
+<!-- End of Basic Settings block -->
 
-      <check_box
-        control_name="RenderDepthOfField"
-        height="16"
-        initial_value="true"
-        label="Depth of Field"
-        layout="topleft"
-        left="90"
-        name="UseDoF"
-        top_delta="16"
-        width="240">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
+<!-- This block shows Advanced Settings -->
+    <panel
+      border="false"
+      follows="all"
+      label="Advanced Settings"
+      layout="topleft"
+      mouse_opaque="false"
+      name="Advanced"
+      top_delta="20"
+      width="517">
 
-      <slider
-        control_name="RenderShadowDetail"
-        follows="left|top"
-        height="16"
-        increment="1"
-        initial_value="2"
-        label="Shadows:"
-        label_width="145"
-        layout="topleft"
-        left="70"
-        min_val="0"
-        max_val="2"
-        name="RenderShadowDetail"
-        show_text="false"
-        top_delta="16"
-        width="260">
-        <slider.commit_callback
-          function="Pref.UpdateSliderText"
-          parameter="RenderShadowDetailText" />
-      </slider>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="16"
+      <scroll_container
+        follows="top|left"
+        height="270"
+        label="CustomGraphics"
         layout="topleft"
-        left_delta="264"
-        name="RenderShadowDetailText"
-        top_delta="0"
-        width="128">
-          None
-      </text>
+        left="5"
+        name="CustomGraphics Scroll"
+        reserve_scroll_corner="true"
+        top_delta="20"
+        width="500">
+
+        <panel
+          border="false"
+          follows="top|left"
+          height="600"
+          label="CustomGraphics"
+          layout="topleft"
+          left="5"
+          name="CustomGraphics Panel"
+          top="106"
+          width="485">
+
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="OtherText"
+            top="10"
+            left="5"
+            width="128">
+             Other
+          </text>
+
+          <slider
+            control_name="RenderFarClip"
+            decimal_digits="0"
+            follows="left|top"
+            height="16"
+            increment="8"
+            initial_value="160"
+            label="Draw distance:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            min_val="64"
+            max_val="512"
+            name="DrawDistance"
+            top_delta="16"
+            width="330" />
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="DrawDistanceMeterText2"
+            top_delta="0"
+            left_delta="330"
+            width="102">
+              m
+          </text> 
+
+          <slider
+            control_name="RenderMaxPartCount"
+            decimal_digits="0"
+            follows="left|top"
+            height="16"
+            increment="256"
+            initial_value="4096"
+            label="Max. particle count:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            max_val="8192"
+            name="MaxParticleCount"
+            top_delta="16"
+            width="336" />
+
+          <slider
+            control_name="RenderGlowResolutionPow"
+            decimal_digits="0"
+            follows="left|top"
+            height="16"
+            increment="1"
+            initial_value="8"
+            label="Post process quality:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            min_val="8"
+            max_val="9"
+            name="RenderPostProcess"
+            show_text="false"
+            top_delta="16"
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="PostProcessText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="PostProcessText"
+            top_delta="0"
+            left_delta="304"
+            width="128">
+               Low
+          </text>
+
+          <slider
+            control_name="RenderTerrainDetail"
+            follows="left|top"
+            height="16"
+            label="Terrain Detail:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            show_text="false"
+            initial_value="0"
+            increment="1"
+            min_val="0"
+            max_val="1"
+            name="TerrainDetail"
+            top_delta="16"
+            width="300" >
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="TerrainDetailText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            top_delta="0"
+            left_delta="304"
+            name="TerrainDetailText"
+            width="128">
+               Low
+          </text>
+
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="AvatarText"
+            top_delta="20"
+            left="5"
+            width="128">
+             Avatar
+          </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="20"
+            width="325" />
+
+          <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"
+            follows="left|top"
+            height="16"
+            increment="0.125"
+            initial_value="160"
+            label="Terrain Mesh Detail:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            min_val="1"
+            max_val="2"
+            name="TerrainMeshDetail"
+            show_text="false"
+            top_delta="16"
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="TerrainMeshDetailText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="TerrainMeshDetailText"
+            top_delta="0"
+            left_delta="304"
+            width="128">
+               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
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="ShadersText"
+            top_delta="20"
+            left="5"
+            width="128">
+             Shaders
+          </text>
+
+          <check_box
+            control_name="RenderTransparentWater"
+            height="16"
+            initial_value="true"
+            label="Transparent Water"
+            layout="topleft"
+            left="30"
+            name="TransparentWater"
+            top_delta="16"
+            width="300" />
+
+          <check_box
+            control_name="RenderObjectBump"
+            height="16"
+            initial_value="true"
+            label="Bump mapping and shiny"
+            layout="topleft"
+            left="30"
+            name="BumpShiny"
+            top_delta="16"
+            width="300">
+            <check_box.commit_callback
+              function="Pref.VertexShaderEnable" />
+          </check_box>
+
+          <check_box
+            control_name="RenderLocalLights"
+            height="16"
+            initial_value="true"
+            label="Local Lights"
+            layout="topleft"
+            left="30"
+            name="LocalLights"
+            top_delta="16"
+            width="300" />
+
+          <check_box
+            control_name="VertexShaderEnable"
+            height="16"
+            initial_value="true"
+            label="Basic shaders"
+            layout="topleft"
+            left="30"
+            name="BasicShaders"
+            tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
+            top_delta="16"
+            width="300">
+            <check_box.commit_callback
+              function="Pref.VertexShaderEnable" />
+          </check_box>
+
+          <check_box
+            control_name="RenderAvatarVP"
+            height="16"
+            initial_value="true"
+            label="Avatar Hardware skinning"
+            layout="topleft"
+            left="50"
+            name="AvatarVertexProgram"
+            top_delta="16"
+            width="280">
+            <check_box.commit_callback
+              function="Pref.VertexShaderEnable" />
+          </check_box>
+
+          <check_box
+            control_name="RenderAvatarCloth"
+            height="16"
+            initial_value="true"
+            label="Avatar cloth"
+            layout="topleft"
+            left="50"
+            name="AvatarCloth"
+            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"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="ReflectionsText"
+            top_delta="0"
+            left_delta="284"
+            width="128">
+               Minimal
+          </text>
+
+          <check_box
+            control_name="WindLightUseAtmosShaders"
+            height="16"
+            initial_value="true"
+            label="Atmospheric shaders"
+            layout="topleft"
+            left="50"
+            name="WindLightUseAtmosShaders"
+            top_delta="16"
+            width="280">
+            <check_box.commit_callback
+              function="Pref.VertexShaderEnable" />
+          </check_box>
+
+          <slider
+            control_name="WLSkyDetail"
+            enabled_control="WindLightUseAtmosShaders"
+            decimal_digits="0"
+            follows="left|top"
+            height="16"
+            increment="8"
+            initial_value="160"
+            label="Sky:"
+            label_width="145"
+            layout="topleft"
+            left="70"
+            min_val="16"
+            max_val="128"
+            name="SkyMeshDetail"
+            show_text="false"
+            top_delta="16"
+            width="260">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="SkyMeshDetailText" />
+          </slider>
+          <text
+            enabled_control="WindLightUseAtmosShaders"
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left_delta="264"
+            name="SkyMeshDetailText"
+            top_delta="0"
+            width="128">
+               Low
+          </text>
+
+          <check_box
+            control_name="RenderDeferred"
+            height="16"
+            initial_value="true"
+            label="Advanced Lighting Model"
+            layout="topleft"
+            left="70"
+            name="UseLightShaders"
+            top_delta="16"
+            width="260">
+            <check_box.commit_callback
+              function="Pref.VertexShaderEnable" />
+          </check_box>
+
+          <check_box
+            control_name="RenderDeferredSSAO"
+            height="16"
+            initial_value="true"
+            label="Ambient Occlusion"
+            layout="topleft"
+            left="90"
+            name="UseSSAO"
+            top_delta="16"
+            width="240">
+            <check_box.commit_callback
+              function="Pref.VertexShaderEnable" />
+          </check_box>
+
+          <check_box
+            control_name="RenderDepthOfField"
+            height="16"
+            initial_value="true"
+            label="Depth of Field"
+            layout="topleft"
+            left="90"
+            name="UseDoF"
+            top_delta="16"
+            width="240">
+            <check_box.commit_callback
+              function="Pref.VertexShaderEnable" />
+          </check_box>
+
+          <slider
+            control_name="RenderShadowDetail"
+            follows="left|top"
+            height="16"
+            increment="1"
+            initial_value="2"
+            label="Shadows:"
+            label_width="145"
+            layout="topleft"
+            left="70"
+            min_val="0"
+            max_val="2"
+            name="RenderShadowDetail"
+            show_text="false"
+            top_delta="16"
+            width="260">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="RenderShadowDetailText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left_delta="264"
+            name="RenderShadowDetailText"
+            top_delta="0"
+            width="128">
+              None
+          </text>
+        </panel>
+      </scroll_container>
     </panel>
-  </scroll_container>
 <!-- End of Advanced Settings block -->
 
-  <button
-    follows="left|bottom"
-    height="23"
-    label="Apply"
-    label_selected="Apply"
-    layout="topleft"
-    left="10"
-    name="Apply"
-    top="390"
-    width="115">
-    <button.commit_callback
-      function="Pref.Apply" />
-  </button>
-  <button
-    follows="left|bottom"
-    height="23"
-    label="Reset"
-    layout="topleft"
-    left_pad="5"
-    name="Defaults"
-    top="390"
-    width="115">
-    <button.commit_callback
-      function="Pref.HardwareDefaults" />
-  </button>
-  <button
-    follows="right|bottom"
-    height="23"
-    label="Hardware"
-    label_selected="Hardware"
-    layout="topleft"
-    left_pad="150"
-    name="GraphicsHardwareButton"
-    top="390"
-    width="115">
-    <button.commit_callback
-      function="Pref.HardwareSettings" />
-  </button>
+    <button
+      follows="left|bottom"
+      height="23"
+      label="Apply"
+      label_selected="Apply"
+      layout="topleft"
+      left="10"
+      name="Apply"
+      top="310"
+      width="115">
+      <button.commit_callback
+        function="Pref.Apply" />
+    </button>
+    <button
+      follows="left|bottom"
+      height="23"
+      label="Reset"
+      layout="topleft"
+       left_pad="5"
+      name="Defaults"
+      top="310"
+      width="115">
+      <button.commit_callback
+        function="Pref.HardwareDefaults" />
+    </button>
+    <button
+      follows="right|bottom"
+      height="23"
+      label="Hardware..."
+      label_selected="Hardware"
+      layout="topleft"
+      left_pad="150"
+      name="GraphicsHardwareButton"
+      top="310"
+      width="115">
+      <button.commit_callback
+        function="Pref.HardwareSettings" />
+    </button>
+  </tab_container>
 </panel>
-- 
cgit v1.2.3


From a0b384d92c30c41f787c264b4e70b235d991b4e3 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 25 Nov 2014 17:31:31 -0500
Subject: STORM-2082 Changed initial text in dropdown box

---
 .../default/xui/en/panel_preferences_graphics1.xml | 65 +++++++++++-----------
 1 file changed, 32 insertions(+), 33 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 0a7cc995c7..bd61f2c4fa 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -9,7 +9,7 @@
  name="Display panel"
  top="1"
  width="517">
-   <string name="graphic_preset_combo_label">-Select a preset-</string>
+   <string name="graphic_preset_combo_label">-None saved yet-</string>
 
 <!-- This block is always displayed -->
   <text
@@ -24,14 +24,13 @@
       Presets:
   </text>
   <combo_box
-   	allow_text_entry="true"
    	follows="top|left"
    	layout="topleft"
    	left_pad="0"
    	max_chars="100"
    	name="graphic_preset_combo"
    	top_delta="0"
-   	width="200"/>
+   	width="150"/>
   <button
     follows="top|left"
     height="23"
@@ -47,7 +46,7 @@
   <button
     follows="top|left"
     height="23"
-    label="Delete"
+    label="Delete..."
     layout="topleft"
     left_pad="5"
     name="PrefDeleteButton"
@@ -193,7 +192,7 @@
     <panel
       border="false"
       follows="all"
-      label="Basic Settings"
+      label="BASIC"
       layout="topleft"
       mouse_opaque="false"
       name="Basic"
@@ -201,63 +200,63 @@
       width="517">
 
       <slider
-        control_name="RenderAvatarLODFactor"
+        control_name="RenderFarClip"
+        decimal_digits="0"
         follows="left|top"
         height="16"
-        increment="0.125"
+        increment="8"
         initial_value="160"
-        label="Avatar detail:"
+        label="Draw distance:"
         label_width="90"
         layout="topleft"
         left="30"
-        name="AvatarMeshDetail2"
-        show_text="false"
+        min_val="64"
+        max_val="512"
+        name="DrawDistance"
         top_delta="0"
-        width="300">
-        <slider.commit_callback
-          function="Pref.UpdateSliderText"
-          parameter="AvatarMeshDetailText2" />
-      </slider>
+        width="330" />
       <text
         type="string"
         length="1"
         follows="left|top"
         height="12"
         layout="topleft"
-        name="AvatarMeshDetailText2"
+        left_delta="330"
+        name="DrawDistanceMeterText2"
         top_delta="0"
-        left_delta="304"
         width="128">
-         Low
+         m
       </text>
 
       <slider
-        control_name="RenderFarClip"
-        decimal_digits="0"
+        control_name="RenderAvatarLODFactor"
         follows="left|top"
         height="16"
-        increment="8"
+        increment="0.125"
         initial_value="160"
-        label="Draw distance:"
+        label="Avatar detail:"
         label_width="90"
         layout="topleft"
         left="30"
-        min_val="64"
-        max_val="512"
-        name="DrawDistance"
+        name="AvatarMeshDetail2"
+        show_text="false"
         top_delta="30"
-        width="330" />
+        width="300">
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="AvatarMeshDetailText2" />
+      </slider>
       <text
         type="string"
         length="1"
         follows="left|top"
         height="12"
         layout="topleft"
-        left_delta="330"
-        name="DrawDistanceMeterText2"
+        name="AvatarMeshDetailText2"
         top_delta="0"
+        left_delta="304"
         width="128">
-         m
+         Low
       </text>
 
       <check_box
@@ -295,7 +294,7 @@
     <panel
       border="false"
       follows="all"
-      label="Advanced Settings"
+      label="ADVANCED"
       layout="topleft"
       mouse_opaque="false"
       name="Advanced"
@@ -320,8 +319,8 @@
           label="CustomGraphics"
           layout="topleft"
           left="5"
-          name="CustomGraphics Panel"
-          top="106"
+          name="Advanced Panel"
+          top_delta="0"
           width="485">
 
           <text
@@ -331,7 +330,7 @@
             height="16"
             layout="topleft"
             name="OtherText"
-            top="10"
+            top="0"
             left="5"
             width="128">
              Other
-- 
cgit v1.2.3


From 78060b7fd2688b113917b58dea25b072779ac4f6 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 26 Nov 2014 16:28:11 -0500
Subject: STORM-2082 Start to convert code to support xml file processing

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 bd61f2c4fa..371a5fd48e 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -916,7 +916,7 @@
             left="70"
             min_val="0"
             max_val="2"
-            name="RenderShadowDetail"
+            name="ShadowDetail"
             show_text="false"
             top_delta="16"
             width="260">
-- 
cgit v1.2.3


From f30e518f1774cc3c1b4641e97c26afa496fb85e5 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 27 Nov 2014 16:20:39 -0500
Subject: STORM-2082 Get writing out and loading presets working

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 371a5fd48e..2cbba946d4 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -30,7 +30,10 @@
    	max_chars="100"
    	name="graphic_preset_combo"
    	top_delta="0"
-   	width="150"/>
+   	width="150">
+    <combo_box.commit_callback
+      function="Pref.Preset" />
+  </combo_box>
   <button
     follows="top|left"
     height="23"
-- 
cgit v1.2.3


From af827615acc6cce0457ba00810136c41283f6158 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 28 Nov 2014 10:00:41 -0500
Subject: STORM-2082 Initial support for presets popup from status bar

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 2cbba946d4..d8095c0476 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -37,14 +37,14 @@
   <button
     follows="top|left"
     height="23"
-    label="Save As..."
+    label="Save..."
     layout="topleft"
     left_pad="5"
-    name="PrefSaveAsButton"
+    name="PrefSaveButton"
     top_delta="0"
     width="115">
     <button.commit_callback
-      function="Pref.PrefSaveAs" />
+      function="Pref.PrefSave" />
   </button>
   <button
     follows="top|left"
-- 
cgit v1.2.3


From 34a79a6ece28fbc560bde907142ecaadf95e910f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 30 Nov 2014 07:15:00 -0500
Subject: STORM-2082 Implement delete floater

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 d8095c0476..3d7fdbb0ab 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -9,7 +9,6 @@
  name="Display panel"
  top="1"
  width="517">
-   <string name="graphic_preset_combo_label">-None saved yet-</string>
 
 <!-- This block is always displayed -->
   <text
@@ -56,7 +55,8 @@
     top_delta="0"
     width="115">
     <button.commit_callback
-      function="Pref.PrefDelete" />
+      function="Pref.PrefDelete"
+	  parameter="graphic"/>
   </button>
   <text
     type="string"
-- 
cgit v1.2.3


From 6d1296f71640c9c25affcff4e784ea5798ba2d5c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 1 Dec 2014 08:09:17 -0500
Subject: STORM-2082 Implement save floater and some code cleanup.

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 3d7fdbb0ab..2a7560fd2c 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -31,7 +31,8 @@
    	top_delta="0"
    	width="150">
     <combo_box.commit_callback
-      function="Pref.Preset" />
+      function="Pref.Preset"
+      parameter="graphic" />
   </combo_box>
   <button
     follows="top|left"
@@ -43,7 +44,8 @@
     top_delta="0"
     width="115">
     <button.commit_callback
-      function="Pref.PrefSave" />
+      function="Pref.PrefSave"
+	  parameter="graphic"/>
   </button>
   <button
     follows="top|left"
-- 
cgit v1.2.3


From e510c786d9b5eea96b9331596c77a79b239de809 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 1 Dec 2014 13:54:32 -0500
Subject: STORM-2082 Disable preset controls unless logged in

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 2a7560fd2c..32de123895 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -17,7 +17,7 @@
     height="16"
     layout="topleft"
     left="5"
-    name="label"
+    name="presets_text"
     top="10"
     width="60">
       Presets:
-- 
cgit v1.2.3


From 7360f046634d013fec1e9b37c60840a83b470ce1 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 1 Dec 2014 15:36:59 -0500
Subject: STORM-2082 Better control on how (or if) to display Default preset
 Make sure default preset is created when flyout panel is activated Only
 display deleted notification upon successful deletion

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 32de123895..4248de4d96 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -962,9 +962,9 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Reset"
+      label="Undo"
       layout="topleft"
-       left_pad="5"
+      left_pad="5"
       name="Defaults"
       top="310"
       width="115">
-- 
cgit v1.2.3


From ade3953e380d9211ad6d332b9b27fa23e57a7d81 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 2 Dec 2014 07:42:32 -0500
Subject: STORM-2082 Add Recommended button

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 4248de4d96..837644ed27 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -971,13 +971,25 @@
       <button.commit_callback
         function="Pref.HardwareDefaults" />
     </button>
+    <button
+      follows="left|bottom"
+      height="23"
+      label="Recommended"
+      layout="topleft"
+      left_pad="5"
+      name="Recommended"
+      top="310"
+      width="115">
+      <button.commit_callback
+        function="Pref.Recommended" />
+    </button>
     <button
       follows="right|bottom"
       height="23"
       label="Hardware..."
       label_selected="Hardware"
       layout="topleft"
-      left_pad="150"
+      left_pad="25"
       name="GraphicsHardwareButton"
       top="310"
       width="115">
-- 
cgit v1.2.3


From cc22efa4c0d6b06bac6f49b6243df7726f89c7c4 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 3 Dec 2014 06:35:46 -0500
Subject: STORM-2082 Remove Apply button. Add new control variable to track
 which preset is active.  Save settings to active preset when clicking on Ok
 button. Initial work to make pulldown operational. Still to do: add pretty
 icon for current preset. Notifications do not appear when called from this
 panel.

---
 .../default/xui/en/panel_preferences_graphics1.xml  | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 837644ed27..6df4a4f2ea 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -37,7 +37,7 @@
   <button
     follows="top|left"
     height="23"
-    label="Save..."
+    label="SaveAs..."
     layout="topleft"
     left_pad="5"
     name="PrefSaveButton"
@@ -946,25 +946,12 @@
     </panel>
 <!-- End of Advanced Settings block -->
 
-    <button
-      follows="left|bottom"
-      height="23"
-      label="Apply"
-      label_selected="Apply"
-      layout="topleft"
-      left="10"
-      name="Apply"
-      top="310"
-      width="115">
-      <button.commit_callback
-        function="Pref.Apply" />
-    </button>
     <button
       follows="left|bottom"
       height="23"
       label="Undo"
       layout="topleft"
-      left_pad="5"
+      left="10"
       name="Defaults"
       top="310"
       width="115">
@@ -974,12 +961,12 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Recommended"
+      label="Recommended Settings"
       layout="topleft"
       left_pad="5"
       name="Recommended"
       top="310"
-      width="115">
+      width="190">
       <button.commit_callback
         function="Pref.Recommended" />
     </button>
-- 
cgit v1.2.3


From 5be238b127ff30f09105ad6f0d9b8ee3dec8b40f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 4 Dec 2014 14:27:15 -0500
Subject: STORM-2082 Revert name of Reset button from Undo back to Reset. 
 Hopefully this will be renamed Recommended Settings. Display a test icon
 (artwork needed) in the pulldown panel

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 6df4a4f2ea..24f3dd803f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -37,7 +37,7 @@
   <button
     follows="top|left"
     height="23"
-    label="SaveAs..."
+    label="Save As..."
     layout="topleft"
     left_pad="5"
     name="PrefSaveButton"
@@ -949,7 +949,7 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Undo"
+      label="Recommended Settings"
       layout="topleft"
       left="10"
       name="Defaults"
@@ -958,18 +958,6 @@
       <button.commit_callback
         function="Pref.HardwareDefaults" />
     </button>
-    <button
-      follows="left|bottom"
-      height="23"
-      label="Recommended Settings"
-      layout="topleft"
-      left_pad="5"
-      name="Recommended"
-      top="310"
-      width="190">
-      <button.commit_callback
-        function="Pref.Recommended" />
-    </button>
     <button
       follows="right|bottom"
       height="23"
-- 
cgit v1.2.3


From 47282ceb7e8b8083cf816dd26bd4907aba313959 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 9 Dec 2014 16:48:00 -0500
Subject: STORM-2082 Improve file error handling, add help topic labels to new
 floaters.

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 24f3dd803f..d0a5075dc8 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -954,7 +954,7 @@
       left="10"
       name="Defaults"
       top="310"
-      width="115">
+      width="200">
       <button.commit_callback
         function="Pref.HardwareDefaults" />
     </button>
-- 
cgit v1.2.3


From 8d12072979ee46a1eb2d13fdfef8bef62ff3f619 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 12 Dec 2014 11:13:11 -0500
Subject: STORM-2082 Merge Hardware floater into main graphics preferences
 display Change notifications so they are emitted only when an error occurs
 Put active preset at top of list Add Maximum ARC slider Merge two small
 methods into slider update code

---
 .../default/xui/en/panel_preferences_graphics1.xml | 218 +++++++++++++++++++--
 1 file changed, 203 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 d0a5075dc8..43b9d6003f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -320,7 +320,7 @@
         <panel
           border="false"
           follows="top|left"
-          height="600"
+          height="700"
           label="CustomGraphics"
           layout="topleft"
           left="5"
@@ -542,9 +542,42 @@
             min_val="1"
             max_val="65"
             name="MaxNumberAvatarDrawn"
-            top_delta="20"
+            top_delta="16"
             width="325" />
 
+          <slider
+            control_name="MaximumARC"
+            follows="left|top"
+            height="16"
+            initial_value="0"
+            increment=".1"
+            label="Maximum ARC:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            min_val="0"
+            max_val="13"
+            name="MaximumARC"
+            show_text="false"
+            top_delta="16"
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="MaximumARCText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            top_delta="0"
+            left_delta="304"
+            name="MaximumARCText"
+            width="128">
+               Low
+          </text>
+
           <check_box
             control_name="RenderUseImpostors"
             height="16"
@@ -941,6 +974,173 @@
             width="128">
               None
           </text>
+
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="ShadersText"
+            top_delta="20"
+            left="5"
+            width="128">
+             Hardware
+          </text>
+
+
+          <slider
+            control_name="TextureMemory"
+            decimal_digits="0"
+            follows="left|top"
+            height="16"
+            increment="16"
+            initial_value="32"
+            label="Texture Memory (MB):"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            max_val="4096"
+            name="GraphicsCardTextureMemory"
+            tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
+            top_delta="16"
+            width="335" />
+
+          <slider
+            control_name="RenderFogRatio"
+            follows="left|top"
+            height="16"
+            initial_value="4"
+            decimal_digits="1"
+            label="Fog Distance Ratio:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            name="fog"
+            min_val="0.5"
+            max_val="10"
+            increment="0.1"
+            top_delta="16"
+            width="332" />
+
+          <slider
+            control_name="RenderGamma"
+            follows="left|top"
+            height="16"
+            initial_value="1"
+            decimal_digits="2"
+            label="Gamma:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            name="gamma"
+            min_val="0"
+            max_val="2"
+            increment="0.01"
+            top_delta="16"
+            width="332" />
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="30"
+            name="(brightness, lower is brighter)"
+            top_delta="16"
+            width="230">
+              (0 = default brightness, lower = brighter)
+          </text>
+
+          <check_box
+            control_name="RenderAnisotropic"
+            height="16"
+            label="Anisotropic Filtering (slower when enabled)"
+            layout="topleft"
+            left="30"
+            name="ani"
+            top_delta="16"
+            width="256" />
+
+          <check_box
+            control_name="RenderVBOEnable"
+            height="16"
+            initial_value="true"
+            label="Enable OpenGL Vertex Buffer Objects"
+            layout="topleft"
+            left="30"
+            top_delta="16"
+            name="vbo"
+            tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+            width="315" />
+
+          <check_box
+            control_name="RenderCompressTextures"
+            height="16"
+            initial_value="true"
+            label="Enable Texture Compression (requires restart)"
+            layout="topleft"
+            left="30"
+            top_delta="16"
+            name="texture compression"
+            tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+            width="315" />
+
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="20"
+            layout="topleft"
+            left="30"
+            name="antialiasing label"
+            top_delta="20"
+            width="100">
+              Antialiasing:
+          </text>
+          <combo_box
+            control_name="RenderFSAASamples"
+            height="20"
+            initial_value="false"
+            label="Antialiasing"
+            layout="topleft"
+            left_pad="40"
+            name="fsaa"
+            top_delta="0"
+            width="90">
+            <combo_box.item
+              label="Disabled"
+              name="FSAADisabled"
+              value="0" />
+            <combo_box.item
+              label="2x"
+              name="2x"
+              value="2" />
+            <combo_box.item
+             label="4x"
+             name="4x"
+             value="4" />
+            <combo_box.item
+             label="8x"
+             name="8x"
+             value="8" />
+            <combo_box.item
+             label="16x"
+             name="16x"
+             value="16" />
+          </combo_box>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left_pad="10"
+            name="antialiasing restart"
+            top_delta="0"
+            width="190">
+             (requires viewer restart)
+          </text>
         </panel>
       </scroll_container>
     </panel>
@@ -958,18 +1158,6 @@
       <button.commit_callback
         function="Pref.HardwareDefaults" />
     </button>
-    <button
-      follows="right|bottom"
-      height="23"
-      label="Hardware..."
-      label_selected="Hardware"
-      layout="topleft"
-      left_pad="25"
-      name="GraphicsHardwareButton"
-      top="310"
-      width="115">
-      <button.commit_callback
-        function="Pref.HardwareSettings" />
-    </button>
+
   </tab_container>
 </panel>
-- 
cgit v1.2.3


From e713ef765f268af1cba0f7b04f1e331332630e97 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sat, 13 Dec 2014 06:28:12 -0500
Subject: STORM-2082 Write out settings to preset file if settings changed on
 the login page Code improvements from bitbucket comments

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 43b9d6003f..4636313f94 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -550,13 +550,13 @@
             follows="left|top"
             height="16"
             initial_value="0"
-            increment=".1"
+            increment="1"
             label="Maximum ARC:"
             label_width="185"
             layout="topleft"
             left="30"
             min_val="0"
-            max_val="13"
+            max_val="100"
             name="MaximumARC"
             show_text="false"
             top_delta="16"
@@ -1158,6 +1158,5 @@
       <button.commit_callback
         function="Pref.HardwareDefaults" />
     </button>
-
   </tab_container>
 </panel>
-- 
cgit v1.2.3


From c655ae00a1e9d3540a9280181766bd4f646e1cce Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sat, 13 Dec 2014 20:53:27 -0500
Subject: STORM-2082 When a control is greyed out make sure it's associated
 text is greyed out. Sky: has two dependencies; grey it out when either one is
 not available. Remove Basic Shaders from Basic tab

---
 .../default/xui/en/panel_preferences_graphics1.xml | 26 ++++++----------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 4636313f94..a53097a117 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -264,28 +264,13 @@
          Low
       </text>
 
-      <check_box
-        control_name="VertexShaderEnable"
-        height="16"
-        initial_value="true"
-        label="Basic shaders"
-        layout="topleft"
-        left="30"
-        name="BasicShaders"
-        tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
-        top_delta="30"
-        width="300">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
-
       <check_box
         control_name="RenderDeferred"
         height="16"
         initial_value="true"
         label="Advanced Lighting Model"
         layout="topleft"
-        left="50"
+        left="30"
         name="UseLightShaders2"
         top_delta="20"
         width="256">
@@ -438,7 +423,7 @@
             width="300" >
             <slider.commit_callback
               function="Pref.UpdateSliderText"
-              parameter="TerrainDetailText" />
+              parameter="TerrainDetail" />
           </slider>
           <text
             type="string"
@@ -449,6 +434,7 @@
             top_delta="0"
             left_delta="304"
             name="TerrainDetailText"
+            text_readonly_color="LabelDisabledColor"
             width="128">
                Low
           </text>
@@ -629,6 +615,7 @@
             height="16"
             layout="topleft"
             name="TerrainMeshDetailText"
+            text_readonly_color="LabelDisabledColor"
             top_delta="0"
             left_delta="304"
             width="128">
@@ -844,6 +831,7 @@
             height="16"
             layout="topleft"
             name="ReflectionsText"
+            text_readonly_color="LabelDisabledColor"
             top_delta="0"
             left_delta="284"
             width="128">
@@ -866,7 +854,6 @@
 
           <slider
             control_name="WLSkyDetail"
-            enabled_control="WindLightUseAtmosShaders"
             decimal_digits="0"
             follows="left|top"
             height="16"
@@ -887,7 +874,6 @@
               parameter="SkyMeshDetailText" />
           </slider>
           <text
-            enabled_control="WindLightUseAtmosShaders"
             type="string"
             length="1"
             follows="left|top"
@@ -895,6 +881,7 @@
             layout="topleft"
             left_delta="264"
             name="SkyMeshDetailText"
+            text_readonly_color="LabelDisabledColor"
             top_delta="0"
             width="128">
                Low
@@ -970,6 +957,7 @@
             layout="topleft"
             left_delta="264"
             name="RenderShadowDetailText"
+            text_readonly_color="LabelDisabledColor"
             top_delta="0"
             width="128">
               None
-- 
cgit v1.2.3


From 6de394342d2a3bd15ab8889e04619591a09fd6c6 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 7 Jan 2015 18:38:31 -0500
Subject: 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

---
 .../default/xui/en/panel_preferences_graphics1.xml | 487 ++++++++++++---------
 1 file changed, 274 insertions(+), 213 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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
@@ -452,85 +504,6 @@
              Avatar
           </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"
@@ -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"
-- 
cgit v1.2.3


From d1bc2fe292edcea60b49ce8111a495974e9415a2 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 14 Jan 2015 19:55:58 -0500
Subject: STORM-2082 Assorted UI tweaks, better MaximumARC formula, pulldowns
 disappear faster

---
 .../default/xui/en/panel_preferences_graphics1.xml | 86 +++++++++++++---------
 1 file changed, 50 insertions(+), 36 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 40b359eb1d..c540000489 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -244,7 +244,6 @@
     top_delta="25"
     width="517">
 
-
 <!-- This block shows Basic Settings -->
     <panel
       border="false"
@@ -316,19 +315,34 @@
          Low
       </text>
 
+      <check_box
+        control_name="WindLightUseAtmosShaders"
+        height="16"
+        initial_value="true"
+        label="Atmospheric shaders"
+        layout="topleft"
+        left="30"
+        name="WindLightUseAtmosShaders"
+        top_delta="20"
+        width="280">
+        <check_box.commit_callback
+          function="Pref.VertexShaderEnable" />
+      </check_box>
+
       <check_box
         control_name="RenderDeferred"
         height="16"
         initial_value="true"
         label="Advanced Lighting Model"
         layout="topleft"
-        left="30"
+        left="50"
         name="UseLightShaders2"
         top_delta="20"
         width="256">
         <check_box.commit_callback
           function="Pref.VertexShaderEnable" />
       </check_box>
+
     </panel>
 <!-- End of Basic Settings block -->
 
@@ -457,40 +471,6 @@
                Low
           </text>
 
-          <slider
-            control_name="RenderTerrainDetail"
-            follows="left|top"
-            height="16"
-            label="Terrain Detail:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            show_text="false"
-            initial_value="0"
-            increment="1"
-            min_val="0"
-            max_val="1"
-            name="TerrainDetail"
-            top_delta="16"
-            width="300" >
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="TerrainDetail" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="304"
-            name="TerrainDetailText"
-            text_readonly_color="LabelDisabledColor"
-            width="128">
-               Low
-          </text>
-
           <text
             type="string"
             length="1"
@@ -691,6 +671,40 @@
               function="Pref.VertexShaderEnable" />
           </check_box>
 
+          <slider
+            control_name="RenderTerrainDetail"
+            follows="left|top"
+            height="16"
+            label="Terrain Detail:"
+            label_width="165"
+            layout="topleft"
+            left="50"
+            show_text="false"
+            initial_value="0"
+            increment="1"
+            min_val="0"
+            max_val="1"
+            name="TerrainDetail"
+            top_delta="16"
+            width="280" >
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="TerrainDetail" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            top_delta="0"
+            left_delta="284"
+            name="TerrainDetailText"
+            text_readonly_color="LabelDisabledColor"
+            width="128">
+               Low
+          </text>
+
           <check_box
             control_name="RenderAvatarVP"
             height="16"
-- 
cgit v1.2.3


From d8969067f7988cf0dda0e1d5e6d6a9064fb40f85 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 15 Jan 2015 04:21:22 -0500
Subject: STORM-2082 Remove Avatar detail from Basic tab

---
 .../default/xui/en/panel_preferences_graphics1.xml | 31 ----------------------
 1 file changed, 31 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 c540000489..888b86482a 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -284,37 +284,6 @@
          m
       </text>
 
-      <slider
-        control_name="RenderAvatarLODFactor"
-        follows="left|top"
-        height="16"
-        increment="0.125"
-        initial_value="160"
-        label="Avatar detail:"
-        label_width="90"
-        layout="topleft"
-        left="30"
-        name="AvatarMeshDetail2"
-        show_text="false"
-        top_delta="30"
-        width="300">
-        <slider.commit_callback
-          function="Pref.UpdateSliderText"
-          parameter="AvatarMeshDetailText2" />
-      </slider>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="12"
-        layout="topleft"
-        name="AvatarMeshDetailText2"
-        top_delta="0"
-        left_delta="304"
-        width="128">
-         Low
-      </text>
-
       <check_box
         control_name="WindLightUseAtmosShaders"
         height="16"
-- 
cgit v1.2.3


From ce324355787bd9c1c864050ca54b4306c30a0e79 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 15 Jan 2015 16:43:43 -0500
Subject: STORM-2082 Use correct icon for checkmark Redo UI layout to indicate
 the two dependencies on the Imposters checkbox Reverse the ARC slider

---
 .../default/xui/en/panel_preferences_graphics1.xml | 70 ++++++++++++----------
 1 file changed, 37 insertions(+), 33 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 888b86482a..983e0edb97 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -453,6 +453,20 @@
              Avatar
           </text>
 
+          <check_box
+            control_name="RenderUseImpostors"
+            height="16"
+            initial_value="true"
+            label="Impostors"
+            layout="topleft"
+            left="30"
+            name="AvatarImpostors"
+            top_delta="20"
+            width="300">
+            <check_box.commit_callback
+              function="Pref.AvatarImpostorsEnable" />
+          </check_box>
+
           <slider
             control_name="MaximumARC"
             follows="left|top"
@@ -460,15 +474,15 @@
             initial_value="0"
             increment="1"
             label="Maximum ARC:"
-            label_width="185"
+            label_width="165"
             layout="topleft"
-            left="30"
+            left="50"
             min_val="0"
             max_val="100"
             name="MaximumARC"
             show_text="false"
             top_delta="16"
-            width="300">
+            width="280">
             <slider.commit_callback
               function="Pref.UpdateSliderText"
               parameter="MaximumARCText" />
@@ -480,12 +494,30 @@
             height="16"
             layout="topleft"
             top_delta="0"
-            left_delta="304"
+            left_delta="284"
+            text_readonly_color="LabelDisabledColor"
             name="MaximumARCText"
             width="128">
-               Low
+               0
           </text>
 
+          <slider
+            control_name="RenderAvatarMaxVisible"
+            decimal_digits="0"
+            follows="left|top"
+            height="16"
+            increment="1"
+            initial_value="12"
+            label="Max. # of non-impostors:"
+            label_width="165"
+            layout="topleft"
+            left="50"
+            min_val="1"
+            max_val="65"
+            name="MaxNumberAvatarDrawn"
+            top_delta="16"
+            width="305" />
+
           <slider
             control_name="RenderAvatarLODFactor"
             follows="left|top"
@@ -548,34 +580,6 @@
                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" />
-
-          <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"
-- 
cgit v1.2.3


From 611391a818746f560ad49847ae643613313ac216 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 20 Jan 2015 09:17:23 -0500
Subject: STORM-2082 Update to new UI design.  Bugs are not worked out yet.

---
 .../default/xui/en/panel_preferences_graphics1.xml | 83 +++++++++++++++-------
 1 file changed, 56 insertions(+), 27 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 983e0edb97..b5a1c1eda6 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -17,36 +17,37 @@
     height="16"
     layout="topleft"
     left="5"
-    name="presets_text"
     top="10"
-    width="60">
-      Presets:
+    width="100">
+      Preset in use:
+  </text>
+
+  <text
+    follows="top|left|right"
+    font="SansSerif"
+    height="16"
+    layout="topleft"
+    left_delta="110"
+    name="preset_text"
+    top="10"
+    width="120">
+      (None)
   </text>
-  <combo_box
-   	follows="top|left"
-   	layout="topleft"
-   	left_pad="0"
-   	max_chars="100"
-   	name="graphic_preset_combo"
-   	top_delta="0"
-   	width="150">
-    <combo_box.commit_callback
-      function="Pref.Preset"
-      parameter="graphic" />
-  </combo_box>
+
   <button
     follows="top|left"
     height="23"
-    label="Save As..."
+    label="Load preset..."
     layout="topleft"
     left_pad="5"
-    name="PrefSaveButton"
+    name="PrefLoadButton"
     top_delta="0"
     width="115">
     <button.commit_callback
-      function="Pref.PrefSave"
+      function="Pref.PrefLoad"
 	  parameter="graphic"/>
   </button>
+
   <button
     follows="top|left"
     height="23"
@@ -60,6 +61,7 @@
       function="Pref.PrefDelete"
 	  parameter="graphic"/>
   </button>
+
   <text
     type="string"
     length="1"
@@ -255,6 +257,19 @@
       top="30"
       width="517">
 
+      <button
+        follows="top|left"
+        height="23"
+        label="Reset all to recommended settings"
+        layout="topleft"
+        left="10"
+        name="Defaults"
+        top_delta="0"
+        width="250">
+        <button.commit_callback
+          function="Pref.HardwareDefaults" />
+      </button>
+
       <slider
         control_name="RenderFarClip"
         decimal_digits="0"
@@ -269,7 +284,7 @@
         min_val="64"
         max_val="512"
         name="DrawDistance"
-        top_delta="0"
+        top_delta="40"
         width="330" />
       <text
         type="string"
@@ -348,6 +363,19 @@
           top_delta="0"
           width="485">
 
+          <button
+            follows="top|left"
+            height="23"
+            label="Reset all to recommended settings"
+            layout="topleft"
+            left="0"
+            name="Defaults"
+            top="0"
+            width="250">
+            <button.commit_callback
+              function="Pref.HardwareDefaults" />
+          </button>
+
           <text
             type="string"
             length="1"
@@ -355,7 +383,7 @@
             height="16"
             layout="topleft"
             name="GeneralText"
-            top="0"
+            top_delta="25"
             left="5"
             width="128">
              General
@@ -471,14 +499,14 @@
             control_name="MaximumARC"
             follows="left|top"
             height="16"
-            initial_value="0"
+            initial_value="101"
             increment="1"
             label="Maximum ARC:"
             label_width="165"
             layout="topleft"
             left="50"
-            min_val="0"
-            max_val="100"
+            min_val="1"
+            max_val="101"
             name="MaximumARC"
             show_text="false"
             top_delta="16"
@@ -1185,14 +1213,15 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Recommended Settings"
+      label="Save settings as a preset..."
       layout="topleft"
       left="10"
-      name="Defaults"
+      name="PrefSaveButton"
       top="310"
-      width="200">
+      width="250">
       <button.commit_callback
-        function="Pref.HardwareDefaults" />
+        function="Pref.PrefSave"
+        parameter="graphic" />
     </button>
   </tab_container>
 </panel>
-- 
cgit v1.2.3


From 56f43a390015f3ba721554ef9a0e436b6bfad5f9 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 20 Jan 2015 13:35:26 -0500
Subject: STORM-2082 Still trying to work out the dirtyChilds issue.  Also made
 some small UI adjustments.

---
 .../default/xui/en/panel_preferences_graphics1.xml      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 b5a1c1eda6..6bc549ce94 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -235,7 +235,8 @@
 
   <tab_container
     follows="left|top"
-    height="400"
+    layout="topleft"
+    height="390"
     halign="center"
     left="0"
     name="PreferencesGraphicsTabs"
@@ -243,7 +244,7 @@
     tab_min_width="40"
     tab_position="top"
     tab_height="25"
-    top_delta="25"
+    top="80"
     width="517">
 
 <!-- This block shows Basic Settings -->
@@ -254,7 +255,7 @@
       layout="topleft"
       mouse_opaque="false"
       name="Basic"
-      top="30"
+      top="10"
       width="517">
 
       <button
@@ -264,7 +265,7 @@
         layout="topleft"
         left="10"
         name="Defaults"
-        top_delta="0"
+        top_delta="5"
         width="250">
         <button.commit_callback
           function="Pref.HardwareDefaults" />
@@ -338,12 +339,12 @@
       layout="topleft"
       mouse_opaque="false"
       name="Advanced"
-      top_delta="20"
+      top_delta="10"
       width="517">
 
       <scroll_container
         follows="top|left"
-        height="270"
+        height="260"
         label="CustomGraphics"
         layout="topleft"
         left="5"
@@ -368,7 +369,7 @@
             height="23"
             label="Reset all to recommended settings"
             layout="topleft"
-            left="0"
+            left="5"
             name="Defaults"
             top="0"
             width="250">
@@ -1217,7 +1218,7 @@
       layout="topleft"
       left="10"
       name="PrefSaveButton"
-      top="310"
+      top="300"
       width="250">
       <button.commit_callback
         function="Pref.PrefSave"
-- 
cgit v1.2.3


From 58577702a8c185683e089afc3f7fbcbaaf40122c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 20 Jan 2015 18:24:02 -0500
Subject: STORM-2082 Finally(?) deal properly with dirty UI processing. Code
 cleanup, some per bitbucket comments.

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 6bc549ce94..ae44d03cb3 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -51,7 +51,7 @@
   <button
     follows="top|left"
     height="23"
-    label="Delete..."
+    label="Delete preset..."
     layout="topleft"
     left_pad="5"
     name="PrefDeleteButton"
@@ -263,7 +263,7 @@
         height="23"
         label="Reset all to recommended settings"
         layout="topleft"
-        left="10"
+        left="5"
         name="Defaults"
         top_delta="5"
         width="250">
@@ -321,7 +321,7 @@
         label="Advanced Lighting Model"
         layout="topleft"
         left="50"
-        name="UseLightShaders2"
+        name="UseLightShaders"
         top_delta="20"
         width="256">
         <check_box.commit_callback
@@ -369,7 +369,7 @@
             height="23"
             label="Reset all to recommended settings"
             layout="topleft"
-            left="5"
+            left="0"
             name="Defaults"
             top="0"
             width="250">
@@ -782,7 +782,7 @@
             label="Atmospheric shaders"
             layout="topleft"
             left="50"
-            name="WindLightUseAtmosShaders"
+            name="WindLightUseAtmosShaders2"
             top_delta="16"
             width="280">
             <check_box.commit_callback
@@ -831,7 +831,7 @@
             label="Advanced Lighting Model"
             layout="topleft"
             left="70"
-            name="UseLightShaders"
+            name="UseLightShaders2"
             top_delta="16"
             width="260">
             <check_box.commit_callback
-- 
cgit v1.2.3


From 6548f1c03d082b89fd6208a26778dd0d0762d850 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sat, 24 Jan 2015 07:31:23 -0500
Subject: STORM-2082 Add 5px more blank space around quality slider. Slightly
 adjust the names of the help text in the three new floaters.

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 ae44d03cb3..13e0593221 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -17,7 +17,7 @@
     height="16"
     layout="topleft"
     left="5"
-    top="10"
+    top="5"
     width="100">
       Preset in use:
   </text>
@@ -29,7 +29,7 @@
     layout="topleft"
     left_delta="110"
     name="preset_text"
-    top="10"
+    top="5"
     width="120">
       (None)
   </text>
@@ -70,7 +70,7 @@
     layout="topleft"
     left="10"
     name="QualitySpeed"
-    top_delta="30" 
+    top_delta="35" 
     width="400">
       Quality &amp; speed:
   </text>
@@ -236,7 +236,7 @@
   <tab_container
     follows="left|top"
     layout="topleft"
-    height="390"
+    height="385"
     halign="center"
     left="0"
     name="PreferencesGraphicsTabs"
@@ -244,7 +244,7 @@
     tab_min_width="40"
     tab_position="top"
     tab_height="25"
-    top="80"
+    top="85"
     width="517">
 
 <!-- This block shows Basic Settings -->
@@ -344,7 +344,7 @@
 
       <scroll_container
         follows="top|left"
-        height="260"
+        height="255"
         label="CustomGraphics"
         layout="topleft"
         left="5"
@@ -1218,7 +1218,7 @@
       layout="topleft"
       left="10"
       name="PrefSaveButton"
-      top="300"
+      top="295"
       width="250">
       <button.commit_callback
         function="Pref.PrefSave"
-- 
cgit v1.2.3


From 45b59881ebcc19510c7e36398232f057366eb41d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 3 Feb 2015 08:37:31 -0500
Subject: STORM-2082 Reformat preset floaters. Remove Impostor checkbox. That
 control is now merged into the right side of the impostors slider. Maximum
 ARC still depends on impostors being enabled.  Once that dependency is
 removed in llvoavatar then it will be necessary to reflect that change in the
 UI code.

---
 .../default/xui/en/panel_preferences_graphics1.xml | 50 +++++++++++-----------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 13e0593221..756c765bbd 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -13,7 +13,6 @@
 <!-- This block is always displayed -->
   <text
     follows="top|left|right"
-    font="SansSerif"
     height="16"
     layout="topleft"
     left="5"
@@ -24,7 +23,6 @@
 
   <text
     follows="top|left|right"
-    font="SansSerif"
     height="16"
     layout="topleft"
     left_delta="110"
@@ -482,20 +480,6 @@
              Avatar
           </text>
 
-          <check_box
-            control_name="RenderUseImpostors"
-            height="16"
-            initial_value="true"
-            label="Impostors"
-            layout="topleft"
-            left="30"
-            name="AvatarImpostors"
-            top_delta="20"
-            width="300">
-            <check_box.commit_callback
-              function="Pref.AvatarImpostorsEnable" />
-          </check_box>
-
           <slider
             control_name="MaximumARC"
             follows="left|top"
@@ -503,15 +487,15 @@
             initial_value="101"
             increment="1"
             label="Maximum ARC:"
-            label_width="165"
+            label_width="185"
             layout="topleft"
-            left="50"
+            left="30"
             min_val="1"
             max_val="101"
             name="MaximumARC"
             show_text="false"
             top_delta="16"
-            width="280">
+            width="300">
             <slider.commit_callback
               function="Pref.UpdateSliderText"
               parameter="MaximumARCText" />
@@ -523,7 +507,7 @@
             height="16"
             layout="topleft"
             top_delta="0"
-            left_delta="284"
+            left_delta="304"
             text_readonly_color="LabelDisabledColor"
             name="MaximumARCText"
             width="128">
@@ -538,14 +522,32 @@
             increment="1"
             initial_value="12"
             label="Max. # of non-impostors:"
-            label_width="165"
+            label_width="185"
             layout="topleft"
-            left="50"
+            left="30"
             min_val="1"
-            max_val="65"
+            max_val="66"
             name="MaxNumberAvatarDrawn"
+            show_text="false"
             top_delta="16"
-            width="305" />
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="ImpostorsText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            top_delta="0"
+            left_delta="304"
+            text_readonly_color="LabelDisabledColor"
+            name="ImpostorsText"
+            width="128">
+               0
+          </text>
 
           <slider
             control_name="RenderAvatarLODFactor"
-- 
cgit v1.2.3


From b4c99cbb0aafc077c67b868ecb2d4c802355f472 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 11 Feb 2015 13:28:39 -0500
Subject: STORM-2082 Attempt to put advanced settings into separate floater

---
 .../default/xui/en/panel_preferences_graphics1.xml | 1084 ++------------------
 1 file changed, 93 insertions(+), 991 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 756c765bbd..5d4bfdd17f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -10,7 +10,6 @@
  top="1"
  width="517">
 
-<!-- This block is always displayed -->
   <text
     follows="top|left|right"
     height="16"
@@ -229,1002 +228,105 @@
       function="Pref.QualityPerformance"/>
   </slider>
 
-<!--End of block that is always displayed -->
-
-  <tab_container
-    follows="left|top"
-    layout="topleft"
-    height="385"
-    halign="center"
-    left="0"
-    name="PreferencesGraphicsTabs"
-    tab_max_width="300"
-    tab_min_width="40"
-    tab_position="top"
-    tab_height="25"
-    top="85"
-    width="517">
-
 <!-- This block shows Basic Settings -->
-    <panel
-      border="false"
-      follows="all"
-      label="BASIC"
-      layout="topleft"
-      mouse_opaque="false"
-      name="Basic"
-      top="10"
-      width="517">
-
-      <button
-        follows="top|left"
-        height="23"
-        label="Reset all to recommended settings"
-        layout="topleft"
-        left="5"
-        name="Defaults"
-        top_delta="5"
-        width="250">
-        <button.commit_callback
-          function="Pref.HardwareDefaults" />
-      </button>
 
-      <slider
-        control_name="RenderFarClip"
-        decimal_digits="0"
-        follows="left|top"
-        height="16"
-        increment="8"
-        initial_value="160"
-        label="Draw distance:"
-        label_width="90"
-        layout="topleft"
-        left="30"
-        min_val="64"
-        max_val="512"
-        name="DrawDistance"
-        top_delta="40"
-        width="330" />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="12"
-        layout="topleft"
-        left_delta="330"
-        name="DrawDistanceMeterText2"
-        top_delta="0"
-        width="128">
-         m
-      </text>
+  <button
+    follows="top|left"
+    height="23"
+    label="Reset all to recommended settings"
+    layout="topleft"
+    left="5"
+    name="Defaults"
+    top_delta="30"
+    width="250">
+    <button.commit_callback
+      function="Pref.HardwareDefaults" />
+  </button>
 
-      <check_box
-        control_name="WindLightUseAtmosShaders"
-        height="16"
-        initial_value="true"
-        label="Atmospheric shaders"
-        layout="topleft"
-        left="30"
-        name="WindLightUseAtmosShaders"
-        top_delta="20"
-        width="280">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
+  <slider
+    control_name="RenderFarClip"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label="Draw distance:"
+    label_width="90"
+    layout="topleft"
+    left="30"
+    min_val="64"
+    max_val="512"
+    name="DrawDistance"
+    top_delta="40"
+    width="330" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_delta="330"
+    name="DrawDistanceMeterText2"
+    top_delta="0"
+    width="128">
+     m
+  </text>
 
-      <check_box
-        control_name="RenderDeferred"
-        height="16"
-        initial_value="true"
-        label="Advanced Lighting Model"
-        layout="topleft"
-        left="50"
-        name="UseLightShaders"
-        top_delta="20"
-        width="256">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
+  <check_box
+    control_name="WindLightUseAtmosShaders"
+    height="16"
+    initial_value="true"
+    label="Atmospheric shaders"
+    layout="topleft"
+    left="30"
+    name="WindLightUseAtmosShaders"
+    top_delta="20"
+    width="280">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderDeferred"
+    height="16"
+    initial_value="true"
+    label="Advanced Lighting Model"
+    layout="topleft"
+    left="50"
+    name="UseLightShaders"
+    top_delta="20"
+    width="256">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
 
-    </panel>
 <!-- End of Basic Settings block -->
 
-<!-- This block shows Advanced Settings -->
-    <panel
-      border="false"
-      follows="all"
-      label="ADVANCED"
-      layout="topleft"
-      mouse_opaque="false"
-      name="Advanced"
-      top_delta="10"
-      width="517">
-
-      <scroll_container
-        follows="top|left"
-        height="255"
-        label="CustomGraphics"
-        layout="topleft"
-        left="5"
-        name="CustomGraphics Scroll"
-        reserve_scroll_corner="true"
-        top_delta="20"
-        width="500">
-
-        <panel
-          border="false"
-          follows="top|left"
-          height="700"
-          label="CustomGraphics"
-          layout="topleft"
-          left="5"
-          name="Advanced Panel"
-          top_delta="0"
-          width="485">
-
-          <button
-            follows="top|left"
-            height="23"
-            label="Reset all to recommended settings"
-            layout="topleft"
-            left="0"
-            name="Defaults"
-            top="0"
-            width="250">
-            <button.commit_callback
-              function="Pref.HardwareDefaults" />
-          </button>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="GeneralText"
-            top_delta="25"
-            left="5"
-            width="128">
-             General
-          </text>
-
-          <slider
-            control_name="RenderFarClip"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="8"
-            initial_value="160"
-            label="Draw distance:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="64"
-            max_val="512"
-            name="DrawDistance"
-            top_delta="16"
-            width="330" />
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="DrawDistanceMeterText2"
-            top_delta="0"
-            left_delta="330"
-            width="102">
-              m
-          </text> 
-
-          <slider
-            control_name="RenderMaxPartCount"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="256"
-            initial_value="4096"
-            label="Max. particle count:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            max_val="8192"
-            name="MaxParticleCount"
-            top_delta="16"
-            width="336" />
-
-          <slider
-            control_name="RenderGlowResolutionPow"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="1"
-            initial_value="8"
-            label="Post process quality:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="8"
-            max_val="9"
-            name="RenderPostProcess"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="PostProcessText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="PostProcessText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="AvatarText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Avatar
-          </text>
-
-          <slider
-            control_name="MaximumARC"
-            follows="left|top"
-            height="16"
-            initial_value="101"
-            increment="1"
-            label="Maximum ARC:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="1"
-            max_val="101"
-            name="MaximumARC"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="MaximumARCText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="304"
-            text_readonly_color="LabelDisabledColor"
-            name="MaximumARCText"
-            width="128">
-               0
-          </text>
-
-          <slider
-            control_name="RenderAvatarMaxVisible"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="1"
-            initial_value="12"
-            label="Max. # of non-impostors:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="1"
-            max_val="66"
-            name="MaxNumberAvatarDrawn"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="ImpostorsText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="304"
-            text_readonly_color="LabelDisabledColor"
-            name="ImpostorsText"
-            width="128">
-               0
-          </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>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ShadersText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Shaders
-          </text>
-
-          <check_box
-            control_name="RenderTransparentWater"
-            height="16"
-            initial_value="true"
-            label="Transparent Water"
-            layout="topleft"
-            left="30"
-            name="TransparentWater"
-            top_delta="16"
-            width="300" />
-
-          <check_box
-            control_name="RenderObjectBump"
-            height="16"
-            initial_value="true"
-            label="Bump mapping and shiny"
-            layout="topleft"
-            left="30"
-            name="BumpShiny"
-            top_delta="16"
-            width="300">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderLocalLights"
-            height="16"
-            initial_value="true"
-            label="Local Lights"
-            layout="topleft"
-            left="30"
-            name="LocalLights"
-            top_delta="16"
-            width="300" />
-
-          <check_box
-            control_name="VertexShaderEnable"
-            height="16"
-            initial_value="true"
-            label="Basic shaders"
-            layout="topleft"
-            left="30"
-            name="BasicShaders"
-            tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
-            top_delta="16"
-            width="300">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <slider
-            control_name="RenderTerrainDetail"
-            follows="left|top"
-            height="16"
-            label="Terrain Detail:"
-            label_width="165"
-            layout="topleft"
-            left="50"
-            show_text="false"
-            initial_value="0"
-            increment="1"
-            min_val="0"
-            max_val="1"
-            name="TerrainDetail"
-            top_delta="16"
-            width="280" >
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="TerrainDetail" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="284"
-            name="TerrainDetailText"
-            text_readonly_color="LabelDisabledColor"
-            width="128">
-               Low
-          </text>
-
-          <check_box
-            control_name="RenderAvatarVP"
-            height="16"
-            initial_value="true"
-            label="Avatar Hardware skinning"
-            layout="topleft"
-            left="50"
-            name="AvatarVertexProgram"
-            top_delta="16"
-            width="280">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderAvatarCloth"
-            height="16"
-            initial_value="true"
-            label="Avatar cloth"
-            layout="topleft"
-            left="50"
-            name="AvatarCloth"
-            top_delta="16"
-            width="280" />
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ReflectionsText"
-            text_readonly_color="LabelDisabledColor"
-            top_delta="16"
-            left="50"
-            width="128">
-               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"
-            height="16"
-            initial_value="true"
-            label="Atmospheric shaders"
-            layout="topleft"
-            left="50"
-            name="WindLightUseAtmosShaders2"
-            top_delta="16"
-            width="280">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <slider
-            control_name="WLSkyDetail"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="8"
-            initial_value="160"
-            label="Sky:"
-            label_width="145"
-            layout="topleft"
-            left="70"
-            min_val="16"
-            max_val="128"
-            name="SkyMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="260">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="SkyMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            left_delta="264"
-            name="SkyMeshDetailText"
-            text_readonly_color="LabelDisabledColor"
-            top_delta="0"
-            width="128">
-               Low
-          </text>
-
-          <check_box
-            control_name="RenderDeferred"
-            height="16"
-            initial_value="true"
-            label="Advanced Lighting Model"
-            layout="topleft"
-            left="70"
-            name="UseLightShaders2"
-            top_delta="16"
-            width="260">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderDeferredSSAO"
-            height="16"
-            initial_value="true"
-            label="Ambient Occlusion"
-            layout="topleft"
-            left="90"
-            name="UseSSAO"
-            top_delta="16"
-            width="240">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderDepthOfField"
-            height="16"
-            initial_value="true"
-            label="Depth of Field"
-            layout="topleft"
-            left="90"
-            name="UseDoF"
-            top_delta="16"
-            width="240">
-            <check_box.commit_callback
-              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="RenderTerrainLODFactor"
-            follows="left|top"
-            height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Terrain Mesh Detail:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="1"
-            max_val="2"
-            name="TerrainMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="TerrainMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="TerrainMeshDetailText"
-            text_readonly_color="LabelDisabledColor"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               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
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ShadersText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Hardware
-          </text>
-
-          <slider
-            control_name="TextureMemory"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="16"
-            initial_value="32"
-            label="Texture Memory (MB):"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            max_val="4096"
-            name="GraphicsCardTextureMemory"
-            tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
-            top_delta="16"
-            width="335" />
-
-          <slider
-            control_name="RenderFogRatio"
-            follows="left|top"
-            height="16"
-            initial_value="4"
-            decimal_digits="1"
-            label="Fog Distance Ratio:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="fog"
-            min_val="0.5"
-            max_val="10"
-            increment="0.1"
-            top_delta="16"
-            width="332" />
-
-          <slider
-            control_name="RenderGamma"
-            follows="left|top"
-            height="16"
-            initial_value="1"
-            decimal_digits="2"
-            label="Gamma:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="gamma"
-            min_val="0"
-            max_val="2"
-            increment="0.01"
-            top_delta="16"
-            width="332" />
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            left="30"
-            name="(brightness, lower is brighter)"
-            top_delta="16"
-            width="230">
-              (0 = default brightness, lower = brighter)
-          </text>
-
-          <check_box
-            control_name="RenderAnisotropic"
-            height="16"
-            label="Anisotropic Filtering (slower when enabled)"
-            layout="topleft"
-            left="30"
-            name="ani"
-            top_delta="16"
-            width="256" />
-
-          <check_box
-            control_name="RenderVBOEnable"
-            height="16"
-            initial_value="true"
-            label="Enable OpenGL Vertex Buffer Objects"
-            layout="topleft"
-            left="30"
-            top_delta="16"
-            name="vbo"
-            tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
-            width="315" />
-
-          <check_box
-            control_name="RenderCompressTextures"
-            height="16"
-            initial_value="true"
-            label="Enable Texture Compression (requires restart)"
-            layout="topleft"
-            left="30"
-            top_delta="16"
-            name="texture compression"
-            tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
-            width="315" />
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="20"
-            layout="topleft"
-            left="30"
-            name="antialiasing label"
-            top_delta="20"
-            width="100">
-              Antialiasing:
-          </text>
-          <combo_box
-            control_name="RenderFSAASamples"
-            height="20"
-            initial_value="false"
-            label="Antialiasing"
-            layout="topleft"
-            left_pad="40"
-            name="fsaa"
-            top_delta="0"
-            width="90">
-            <combo_box.item
-              label="Disabled"
-              name="FSAADisabled"
-              value="0" />
-            <combo_box.item
-              label="2x"
-              name="2x"
-              value="2" />
-            <combo_box.item
-             label="4x"
-             name="4x"
-             value="4" />
-            <combo_box.item
-             label="8x"
-             name="8x"
-             value="8" />
-            <combo_box.item
-             label="16x"
-             name="16x"
-             value="16" />
-          </combo_box>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            left_pad="10"
-            name="antialiasing restart"
-            top_delta="0"
-            width="190">
-             (requires viewer restart)
-          </text>
-        </panel>
-      </scroll_container>
-    </panel>
-<!-- End of Advanced Settings block -->
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Advanced Settings..."
+    layout="topleft"
+    left="10"
+    name="AdvancedSettings"
+    top_delta="60"
+    width="200">
+    <button.commit_callback
+      function="Pref.Advanced"
+      parameter="advanced" />
+  </button>
 
-    <button
-      follows="left|bottom"
-      height="23"
-      label="Save settings as a preset..."
-      layout="topleft"
-      left="10"
-      name="PrefSaveButton"
-      top="295"
-      width="250">
-      <button.commit_callback
-        function="Pref.PrefSave"
-        parameter="graphic" />
-    </button>
-  </tab_container>
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Save settings as a preset..."
+    layout="topleft"
+    left="10"
+    name="PrefSaveButton"
+    top="295"
+    width="200">
+    <button.commit_callback
+      function="Pref.PrefSave"
+      parameter="graphic" />
+  </button>
 </panel>
-- 
cgit v1.2.3


From 986ddaf9e8770f31461a9240cce5a720cd20bc66 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 22 Feb 2015 09:01:49 -0500
Subject: STORM-2082 XML changes: move Reset button, add Ok and Cancel buttons

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 5d4bfdd17f..a94907f0c9 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -233,12 +233,12 @@
   <button
     follows="top|left"
     height="23"
-    label="Reset all to recommended settings"
+    label="Reset to recommended settings"
     layout="topleft"
     left="5"
     name="Defaults"
     top_delta="30"
-    width="250">
+    width="210">
     <button.commit_callback
       function="Pref.HardwareDefaults" />
   </button>
-- 
cgit v1.2.3


From 1b7c00b558c55dd2c7a8edd8a82632dcb1219fce Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 22 Feb 2015 10:19:41 -0500
Subject: STORM-2082 Rearrange Reset, load, save, delete buttons. Make load,
 save, and delete floaters close when preferences floater closes.

---
 .../default/xui/en/panel_preferences_graphics1.xml | 107 +++++++++++----------
 1 file changed, 54 insertions(+), 53 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')

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 a94907f0c9..6cf9045f2a 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -31,34 +31,6 @@
       (None)
   </text>
 
-  <button
-    follows="top|left"
-    height="23"
-    label="Load preset..."
-    layout="topleft"
-    left_pad="5"
-    name="PrefLoadButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefLoad"
-	  parameter="graphic"/>
-  </button>
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Delete preset..."
-    layout="topleft"
-    left_pad="5"
-    name="PrefDeleteButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefDelete"
-	  parameter="graphic"/>
-  </button>
-
   <text
     type="string"
     length="1"
@@ -230,19 +202,6 @@
 
 <!-- This block shows Basic Settings -->
 
-  <button
-    follows="top|left"
-    height="23"
-    label="Reset to recommended settings"
-    layout="topleft"
-    left="5"
-    name="Defaults"
-    top_delta="30"
-    width="210">
-    <button.commit_callback
-      function="Pref.HardwareDefaults" />
-  </button>
-
   <slider
     control_name="RenderFarClip"
     decimal_digits="0"
@@ -303,30 +262,72 @@
 <!-- End of Basic Settings block -->
 
   <button
-    follows="left|bottom"
+    follows="top|left"
     height="23"
-    label="Advanced Settings..."
+    label="Save settings as a preset..."
     layout="topleft"
     left="10"
-    name="AdvancedSettings"
-    top_delta="60"
+    name="PrefSaveButton"
+    top="310"
     width="200">
     <button.commit_callback
-      function="Pref.Advanced"
-      parameter="advanced" />
+      function="Pref.PrefSave"
+      parameter="graphic" />
   </button>
 
   <button
-    follows="left|bottom"
+    follows="top|left"
     height="23"
-    label="Save settings as a preset..."
+    label="Load preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefLoadButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefLoad"
+	  parameter="graphic"/>
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Delete preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefDeleteButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefDelete"
+	  parameter="graphic"/>
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Reset to recommended settings"
     layout="topleft"
     left="10"
-    name="PrefSaveButton"
-    top="295"
+    name="Defaults"
+    top_delta="65"
+    width="210">
+    <button.commit_callback
+      function="Pref.HardwareDefaults" />
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Advanced Settings..."
+    layout="topleft"
+    left_pad="10"
+    name="AdvancedSettings"
+    top_delta="0"
     width="200">
     <button.commit_callback
-      function="Pref.PrefSave"
-      parameter="graphic" />
+      function="Pref.Advanced"
+      parameter="advanced" />
   </button>
+
 </panel>
-- 
cgit v1.2.3