From 3cf8a1ce6e81c30cf7231a5ab045bbc45c6757e2 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 20 Feb 2015 12:56:45 -0500
Subject: Clean up impostors and visual muting Rename the settings that control
 them to be more descriptive Remove the separate boolean setting
 (RenderUseImpostors) that governed both Establish default values based on gpu
 class for impostors and visual muting

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

(limited to 'indra/newview/skins')

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..8634b5fed2 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -481,7 +481,7 @@
           </text>
 
           <slider
-            control_name="MaximumARC"
+            control_name="IndirectMaxComplexity"
             follows="left|top"
             height="16"
             initial_value="101"
@@ -492,13 +492,13 @@
             left="30"
             min_val="1"
             max_val="101"
-            name="MaximumARC"
+            name="IndirectMaxComplexity"
             show_text="false"
             top_delta="16"
             width="300">
             <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="MaximumARCText" />
+              function="Pref.UpdateIndirectMaxComplexity"
+              parameter="IndirectMaxComplexityText" />
           </slider>
           <text
             type="string"
@@ -509,31 +509,31 @@
             top_delta="0"
             left_delta="304"
             text_readonly_color="LabelDisabledColor"
-            name="MaximumARCText"
+            name="IndirectMaxComplexityText"
             width="128">
                0
           </text>
 
           <slider
-            control_name="RenderAvatarMaxVisible"
+            control_name="IndirectMaxNonImpostors"
             decimal_digits="0"
             follows="left|top"
             height="16"
             increment="1"
-            initial_value="12"
+            initial_value="0"
             label="Max. # of non-impostors:"
             label_width="185"
             layout="topleft"
             left="30"
             min_val="1"
             max_val="66"
-            name="MaxNumberAvatarDrawn"
+            name="IndirectMaxNonImpostors"
             show_text="false"
             top_delta="16"
             width="300">
             <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="ImpostorsText" />
+              function="Pref.UpdateIndirectMaxNonImpostors"
+              parameter="IndirectMaxNonImpostorsText" />
           </slider>
           <text
             type="string"
@@ -544,9 +544,9 @@
             top_delta="0"
             left_delta="304"
             text_readonly_color="LabelDisabledColor"
-            name="ImpostorsText"
+            name="IndirectMaxNonImpostorsText"
             width="128">
-               0
+               No Limit
           </text>
 
           <slider
-- 
cgit v1.2.3