diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-30 21:17:25 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-30 21:17:25 +0000 |
| commit | 701e8515130d89430a3a20a0e1e31e34d571ae53 (patch) | |
| tree | b9c6449b7d69f540b965ab16810eb1542afb06d4 /indra/newview/app_settings | |
| parent | 01770f3ce32767a62a6920646a9a4e3906fecc59 (diff) | |
| parent | 49a2b3b5d76f646ab1a2681ed7fe626128aaf101 (diff) | |
Merged in euclid-wip-SL12594 (pull request #3)
SL-12594, Remove ability to de-select Basic Shaders (ie disable Fixed Function rendering)
Approved-by: Bradley Payne <vir@lindenlab.com>
Approved-by: Michael Pohoreski <ptolemy@lindenlab.com>
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/high_graphics.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/low_graphics.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/mid_graphics.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/ultra_graphics.xml | 2 |
5 files changed, 2 insertions, 8 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"/> |