SL-17706 Deprecate RenderGamma and RenderFogRatio and remove dead UI from graphics preferences.

3 files changed, 2 insertions, 53 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3bbfed4d29..8a86faa18d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9857,7 +9857,7 @@
     <key>RenderFogRatio</key>
     <map>
       <key>Comment</key>
-      <string>Distance from camera where fog reaches maximum density (fraction or multiple of far clip distance)</string>
+      <string>DEPRECATED - Distance from camera where fog reaches maximum density (fraction or multiple of far clip distance)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9868,7 +9868,7 @@
     <key>RenderGamma</key>
     <map>
       <key>Comment</key>
-      <string>Sets gamma exponent for renderer</string>
+      <string>DEPRECATED - Sets gamma exponent for renderer</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 7a5999147c..20749b67b2 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1269,11 +1269,6 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
 		getChildView("texture compression")->setEnabled(FALSE);
 	}
 
-	// if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
-	LLUICtrl* gamma_ctrl = getChild<LLUICtrl>("gamma");
-	gamma_ctrl->setEnabled(!gPipeline.canUseWindLightShaders());
-	getChildView("(brightness, lower is brighter)")->setEnabled(!gPipeline.canUseWindLightShaders());
-	getChildView("fog")->setEnabled(!gPipeline.canUseWindLightShaders());
 	getChildView("antialiasing restart")->setVisible(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred"));
 
 	// now turn off any features that are unavailable
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 b102007806..b7708b057d 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
@@ -289,52 +289,6 @@
     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="260">
-      (0 = default brightness, lower = brighter)
-  </text>
-
   <check_box
     control_name="RenderAnisotropic"
     height="16"