summaryrefslogtreecommitdiff
path: root/indra/newview/featuretable.txt
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-08 15:28:13 -0600
committerDave Parks <davep@lindenlab.com>2011-11-08 15:28:13 -0600
commit0d568ce9f0522eaa21a12fa5fae31f80c59bd947 (patch)
tree6b849a3b48a35feaeff0278ca8e562359df852e2 /indra/newview/featuretable.txt
parent28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff)
parentef8bdb5d95ebd869279ee4bb0510d54e51ab747f (diff)
merge
Diffstat (limited to 'indra/newview/featuretable.txt')
-rwxr-xr-xindra/newview/featuretable.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 9ad313a9a7..0f33d40ac3 100755
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -69,6 +69,8 @@ RenderShadowDetail 1 2
WatchdogDisabled 1 1
RenderUseStreamVBO 1 1
RenderFSAASamples 1 16
+RenderMaxTextureIndex 1 16
+
//
// Low Graphics Settings
@@ -159,7 +161,7 @@ WLSkyDetail 1 48
RenderDeferred 1 0
RenderDeferredSSAO 1 0
RenderShadowDetail 1 0
-RenderFSAASamples 1 4
+RenderFSAASamples 1 2
//
// Ultra graphics (REALLY PURTY!)
@@ -188,7 +190,7 @@ WLSkyDetail 1 128
RenderDeferred 1 1
RenderDeferredSSAO 1 1
RenderShadowDetail 1 2
-RenderFSAASamples 1 8
+RenderFSAASamples 1 2
//
@@ -296,6 +298,7 @@ RenderVBOEnable 1 0
list OpenGLPre30
RenderDeferred 0 0
+RenderMaxTextureIndex 1 1
list Intel
RenderAnisotropic 1 0