summaryrefslogtreecommitdiff
path: root/indra/newview/featuretable.txt
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
committerChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
commitce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch)
tree3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/featuretable.txt
parentb699ae454d8477d19342d320758cd993d1d28cec (diff)
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/featuretable.txt')
-rw-r--r--indra/newview/featuretable.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 28b1ddc131..f98b42bba2 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -34,6 +34,8 @@ RenderParticleCount 1 4096
RenderRippleWater 1 1
RenderTerrainDetail 1 2
VertexShaderEnable 1 1
+UseOcclusion 1 1
+RenderCubeMap 1 1
//
// Class 0 Hardware (Unknown or just old)