diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-06 17:48:24 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-06 17:48:24 -0500 |
| commit | c5fd41b2328bf4d029a6ba0c837f365d10b49181 (patch) | |
| tree | 614de4bf1f9fe82ee6416aafd7f5314e9302e5e3 /indra | |
| parent | 75cb9fde7d9dcc2792fedcb560ab6b207f5d2b78 (diff) | |
| parent | 39bf9be14271fc63370faef3767588425b7fbe0c (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/featuretable_linux.txt | 1 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 20 |
2 files changed, 20 insertions, 1 deletions
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index e86663b748..058bdcc730 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -59,7 +59,6 @@ Disregard96DefaultDrawDistance 1 1 RenderTextureMemoryMultiple 1 1.0 SkyUseClassicClouds 1 1 RenderShaderLightingMaxLevel 1 3 -RenderDeferred 1 0 RenderDeferred 1 1 RenderDeferredSSAO 1 1 RenderShadowDetail 1 2 diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index e715054c54..6bdb1e1787 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -62,6 +62,10 @@ Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 SkyUseClassicClouds 1 1 WatchdogDisabled 1 1 +RenderDeferred 1 1 +RenderDeferredSSAO 1 1 +RenderShadowDetail 1 2 + // // Low Graphics Settings @@ -91,6 +95,10 @@ VertexShaderEnable 1 0 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 SkyUseClassicClouds 1 0 +RenderDeferred 1 0 +RenderDeferredSSAO 1 0 +RenderShadowDetail 1 2 + // // Mid Graphics Settings @@ -118,6 +126,10 @@ RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 +RenderDeferred 1 0 +RenderDeferredSSAO 1 0 +RenderShadowDetail 1 2 + // // High Graphics Settings (purty) @@ -145,6 +157,10 @@ RenderWaterReflections 1 0 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 48 +RenderDeferred 1 0 +RenderDeferredSSAO 1 0 +RenderShadowDetail 1 2 + // // Ultra graphics (REALLY PURTY!) @@ -172,6 +188,10 @@ RenderWaterReflections 1 1 VertexShaderEnable 1 1 WindLightUseAtmosShaders 1 1 WLSkyDetail 1 128 +RenderDeferred 1 0 +RenderDeferredSSAO 1 0 +RenderShadowDetail 1 2 + // // Class Unknown Hardware (unknown) |