diff options
author | Dave Parks <davep@lindenlab.com> | 2010-08-31 16:37:40 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-08-31 16:37:40 -0500 |
commit | e68f9e566b5aeb5341f5adea0b8a6ccde86ee93d (patch) | |
tree | 6454bf6b303d03f89e567a6ea9cfee7c85aaa1ac /indra/newview/featuretable.txt | |
parent | 3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff) | |
parent | 771195865c4fb336f573025e9a7a22313bfb6cb8 (diff) |
merge
Diffstat (limited to 'indra/newview/featuretable.txt')
-rw-r--r-- | indra/newview/featuretable.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 9440e877df..5705aa8b05 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -55,10 +55,11 @@ Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 RenderTextureMemoryMultiple 1 1.0 RenderShaderLightingMaxLevel 1 3 +RenderDeferred 1 1 SkyUseClassicClouds 1 1 -RenderDeferred 1 0 -RenderDeferredSSAO 1 0 -RenderShadowDetail 1 0 +RenderDeferredSSAO 1 1 +RenderShadowDetail 1 2 +RenderUseFBO 1 1 WatchdogDisabled 1 1 RenderUseStreamVBO 1 1 @@ -167,9 +168,10 @@ RenderVolumeLODFactor 1 2.0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 128 -RenderDeferred 1 0 -RenderDeferredSSAO 1 0 -RenderShadowDetail 1 0 +RenderDeferred 1 1 +RenderDeferredSSAO 1 1 +RenderShadowDetail 1 2 + // // Class Unknown Hardware (unknown) @@ -227,6 +229,7 @@ RenderDeferred 0 0 RenderDeferredSSAO 0 0 RenderShadowDetail 0 0 + // // "Default" setups for safe, low, medium, high // @@ -245,6 +248,7 @@ RenderDeferred 0 0 RenderDeferredSSAO 0 0 RenderShadowDetail 0 0 + // // CPU based feature masks // |