summaryrefslogtreecommitdiff
path: root/indra/newview/featuretable_linux.txt
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-06-10 10:36:27 -0400
committerprep linden <prep@lindenlab.com>2011-06-10 10:36:27 -0400
commitfd2b902f1d104bd7e6a989879d76b0e9797167c1 (patch)
tree22d5b89bad6ae70ef2160441d12ef2df166b15e8 /indra/newview/featuretable_linux.txt
parentfd51f4d17012eb0a53ca9d8c5ccb8c7b4542fc3a (diff)
parent7c57d593e505cb92d2dd152bef14653ef702e3ab (diff)
merge
Diffstat (limited to 'indra/newview/featuretable_linux.txt')
-rw-r--r--indra/newview/featuretable_linux.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 9daa5a5b29..dab73dc3d1 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 24
+version 25
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
@@ -48,6 +48,7 @@ RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
RenderUseImpostors 1 1
RenderVBOEnable 1 1
+RenderVBOMappingDisable 1 1
RenderVolumeLODFactor 1 2.0
UseStartScreen 1 1
UseOcclusion 1 1
@@ -242,6 +243,13 @@ RenderDeferred 0 0
RenderDeferredSSAO 0 0
RenderShadowDetail 0 0
+//
+// No GL_ARB_map_buffer_range
+//
+list NoMapBufferRange
+RenderVBOMappingDisable 1 0
+
+
// "Default" setups for safe, low, medium, high
//