SL-18202 remove old autofps

3 files changed, 6 insertions, 69 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 154c8b7909..9da6ec093b 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
@@ -40,8 +40,6 @@
     name="DrawDistance"
     top_delta="16"
     width="330">
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
     </slider>
   <text
     type="string"
@@ -185,8 +183,6 @@
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxNonImpostors"
       parameter="IndirectNonImpostorsText" />
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
   </slider>
   <text
     type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index 1eee799986..ee8105eac9 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -67,39 +67,6 @@
    text_color="White"
    height="18"
    layout="topleft"
-   top_pad="20"
-   left="20"
-   name="auto_lbl"
-   width="105">
-    Automatic settings
-  </text>
-  <check_box
-   control_name="AutoFPS"
-   height="16"
-   initial_value="true"
-   label="Allow system to choose settings for best experience"
-   label_text.text_color="White"
-   label_text.v_pad="-1"
-   label_text.h_pad="3"
-   layout="topleft"
-   left_pad="30"
-   name="AutoFPS"
-   width="256">
-  </check_box>
-  <view_border
-   bevel_style="in"
-   height="0"
-   layout="topleft"
-   name="border1"
-   left="20"
-   top_pad="12"
-   width="540"/>
-  <text
-   follows="left|top"
-   font="SansSerifSmall"
-   text_color="White"
-   height="18"
-   layout="topleft"
    top_pad="30"
    name="quality_lbl"
    width="100">
@@ -240,8 +207,6 @@
     name="draw_distance"
     left_pad="5"
     width="250">
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
   </slider>
   <text
     type="string"
@@ -520,7 +485,7 @@
    font="SansSerifSmall"
    height="18"
    layout="topleft"
-   top="130"
+   top="80"
    left="213"
    name="1_lbl"
    width="7">
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 93cb3ea9c8..5aff7a5127 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -30,28 +30,7 @@
     width="120">
       (None)
   </text>
-  <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="border1"
-    left="12"
-    top_pad="12"
-    width="477"/>
-  <check_box
-    control_name="AutoFPS"
-    height="16"
-    initial_value="true"
-    label="Allow system to choose settings for best experience"
-    label_text.text_color="White"
-    label_text.v_pad="-1"
-    label_text.h_pad="5"
-    layout="topleft"
-    left="10"
-    name="AutoFPS"
-    top_delta="15"
-    width="256">
-  </check_box>
+
   <text
     type="string"
     length="1"
@@ -60,7 +39,7 @@
     layout="topleft"
     left="10"
     name="QualitySpeed"
-    top_delta="30" 
+    top_delta="35" 
     width="400">
       Quality &amp; speed:
   </text>
@@ -238,10 +217,7 @@
     max_val="512"
     name="DrawDistance"
     top_delta="40"
-    width="330">
-    <slider.mouse_down_callback
-      function="Pref.AutoAdjustWarning" />
-  </slider>
+    width="330" />
   <text
     type="string"
     length="1"
@@ -282,7 +258,7 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
-
+  
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
@@ -298,7 +274,7 @@
     max_val="101"
     name="IndirectMaxComplexity"
     show_text="false"
-    top_delta="34"
+    top_delta="60"
     width="300">
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxComplexity"