diff options
Diffstat (limited to 'indra')
6 files changed, 3 insertions, 9 deletions
diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml index c38b3fcda4..662f7e39dd 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 df3f67a5a1..0ee8e7a059 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 a10c02b79f..c89e060307 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 05722bd8c1..0cb9ee3ace 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 3e7fccbd5f..eb2cd356d9 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 ce219069e7..e93568a87e 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" |