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

1 files changed, 7 insertions, 19 deletions

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
@@ -265,27 +265,12 @@
       </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