SL-17706 Deprecate avatar cloth and remove dead UI from graphics preferences.

1 files changed, 8 insertions, 97 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 1d508b2e36..b102007806 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -612,51 +612,6 @@
     top_delta="16"
     width="300" />
 
-  <slider
-    control_name="RenderTerrainDetail"
-    follows="left|top"
-    height="16"
-    label="Terrain Detail:"
-    label_width="165"
-    layout="topleft"
-    left="440"
-    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="65">
-       Low
-  </text>
-
-  <check_box
-    control_name="RenderAvatarCloth"
-    height="16"
-    initial_value="true"
-    label="Avatar cloth"
-    layout="topleft"
-    left="440"
-    name="AvatarCloth"
-    top_delta="16"
-    width="280" />
-
   <text
     type="string"
     length="1"
@@ -666,7 +621,7 @@
     name="ReflectionsText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
-    left="440"
+    left="420"
     width="128">
        Water Reflections:
   </text>
@@ -708,20 +663,6 @@
         value="4"/>
   </combo_box>
 
-  <check_box
-    control_name="WindLightUseAtmosShaders"
-    height="16"
-    initial_value="true"
-    label="Atmospheric shaders"
-    layout="topleft"
-    left="440"
-    name="WindLightUseAtmosShaders"
-    top_delta="16"
-    width="280">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <slider
     control_name="WLSkyDetail"
     decimal_digits="0"
@@ -732,7 +673,7 @@
     label="Sky:"
     label_width="145"
     layout="topleft"
-    left="460"
+    left="420"
     min_val="16"
     max_val="128"
     name="SkyMeshDetail"
@@ -758,26 +699,12 @@
   </text>
 
   <check_box
-    control_name="RenderDeferred"
-    height="16"
-    initial_value="true"
-    label="Advanced Lighting Model"
-    layout="topleft"
-    left="460"
-    name="UseLightShaders"
-    top_delta="16"
-    width="260">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
-  <check_box
     control_name="RenderDeferredSSAO"
     height="16"
     initial_value="true"
     label="Ambient Occlusion"
     layout="topleft"
-    left="480"
+    left="420"
     name="UseSSAO"
     top_delta="16"
     width="240">
@@ -791,7 +718,7 @@
     initial_value="true"
     label="Depth of Field"
     layout="topleft"
-    left="480"
+    left="420"
     name="UseDoF"
     top_delta="16"
     width="240">
@@ -799,29 +726,13 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <!--
-  <check_box
-    control_name="RenderUseAdvancedAtmospherics"
-    height="16"
-    initial_value="true"
-    label="Advanced Atmospherics"
-    layout="topleft"
-    left="480"
-    name="UseAdvancedAtmo"
-    top_delta="16"
-    width="240">
-    <check_box.commit_callback
-      function="Pref.AdvancedAtmosphericsEnable" />
-  </check_box>
-  -->
-
   <text
     type="string"
     length="1"
     follows="left|top"
     height="16"
     layout="topleft"
-    left="480"
+    left="420"
     name="RenderShadowDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
@@ -855,7 +766,7 @@
     follows="left|top"
     height="16"
     layout="topleft"
-    left="480"
+    left="420"
     name="RenderReflectionDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
@@ -891,7 +802,7 @@
       layout="topleft"
       left="13"
       name="horiz_border"
-      top_pad="21"
+      top="338"
       top_delta="5"
       width="774"/>
   <button
@@ -901,7 +812,7 @@
     layout="topleft"
     left="20"
     name="Defaults"
-    top_delta="10"
+    top_delta="20"
     width="210">
     <button.commit_callback
       function="Pref.HardwareDefaults" />