diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml
index c38b3fcda4a3faf85febaba157a4745236ddd39c..662f7e39dd1739742cb25140eee1f3e5fac53210 100644
--- a/indra/newview/app_settings/high_graphics.xml
+++ b/indra/newview/app_settings/high_graphics.xml
@@ -33,8 +33,6 @@
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="1.125"/>
 	<!--NO SHADERS-->
-	<VertexShaderEnable value="TRUE"/>
-	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="TRUE"/>
 	<!--Deferred Shading-->
 	<RenderDeferred value="FALSE"/>
diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml
index df3f67a5a1a6345478e1ca0cafcd8bcf7dd39b66..0ee8e7a05988a3ed78101e7f064c27b1253c1a53 100644
--- a/indra/newview/app_settings/low_graphics.xml
+++ b/indra/newview/app_settings/low_graphics.xml
@@ -33,8 +33,6 @@
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="1.125"/>
 	<!--NO SHADERS-->
-	<VertexShaderEnable value="FALSE"/>
-	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="FALSE"/>
 	<!--No Deferred Shading-->
 	<RenderDeferred value="FALSE"/>
diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml
index a10c02b79f21ccce113b709ecd7559d14a61a7f5..c89e060307a72a0777b8a863fd5f3ac1570d374f 100644
--- a/indra/newview/app_settings/mid_graphics.xml
+++ b/indra/newview/app_settings/mid_graphics.xml
@@ -33,8 +33,6 @@
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="1.125"/>
 	<!--NO SHADERS-->
-	<VertexShaderEnable value="TRUE"/>
-	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="FALSE"/>
 	<!--No Deferred Shading-->
 	<RenderDeferred value="FALSE"/>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 05722bd8c144652f9df97c794a95a6c618954171..0cb9ee3aceb4970dd40047c06738f23069e323f5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14259,6 +14259,7 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <!-- SL-12594 removes fixed function rendering
     <key>VertexShaderEnable</key>
     <map>
       <key>Comment</key>
@@ -14270,6 +14271,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <-->
     <key>VivoxAutoPostCrashDumps</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/ultra_graphics.xml b/indra/newview/app_settings/ultra_graphics.xml
index 3e7fccbd5f1e2b917ba83f72d536cb17d51f2447..eb2cd356d94e8fcff1c394b4e1ad25dc6136a99a 100644
--- a/indra/newview/app_settings/ultra_graphics.xml
+++ b/indra/newview/app_settings/ultra_graphics.xml
@@ -34,8 +34,6 @@
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="2.0"/>
 	<!--NO SHADERS-->
-	<VertexShaderEnable value="TRUE"/>
-	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="TRUE"/>
 	<!--Deferred Shading-->
 	<RenderDeferred value="TRUE"/>
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 ce219069e7b66b63983a2dc2b6b28aa67a686563..e93568a87e59d11f122ce63948b7c0c487adf52f 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
@@ -623,7 +623,7 @@
     top_delta="16"
     width="300" />
 
-  <!-- SL-12594, basic shaders always enabled  
+  <!-- SL-12594, basic shaders always enabled, no fixed-function GL 
   <check_box
     control_name="VertexShaderEnable"
     height="16"