summaryrefslogtreecommitdiff
path: root/indra/newview/featuretable.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-17 18:06:24 -0400
committerOz Linden <oz@lindenlab.com>2013-05-17 18:06:24 -0400
commit9ef64494559dce5f7c0afb271b591036054f01ce (patch)
tree4815b3852eaf7c4465958a8c9c03865d3d84317b /indra/newview/featuretable.txt
parent4d62a56ff9bc9f2db5d85d5549e6bb7d8a84d04a (diff)
parent2ff880ddb151ee3bb074f507f58f60bdebc458e8 (diff)
merge changes for lastest integrations
Diffstat (limited to 'indra/newview/featuretable.txt')
-rwxr-xr-xindra/newview/featuretable.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index cd7825ba9f..4030324ecb 100755
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -441,7 +441,7 @@ list OpenGLPre15
RenderVBOEnable 1 0
list OpenGLPre30
-RenderDeferred 1 0
+RenderDeferred 0 0
RenderMaxTextureIndex 1 1
list Intel