summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-06-07 14:45:38 -0400
committerLogan Dethrow <log@lindenlab.com>2011-06-07 14:45:38 -0400
commit4afd31b408ddbe7923773a6f12e4eec3c7876e54 (patch)
treea2acefda64948372d4d7677c01aaf8b9daed952c /indra/newview
parent18a2c3c017d8f967425076fb21f11c56d18a732b (diff)
parent0de24f857ac359e04d7def2afa7d8efe5a4cef97 (diff)
Merge VWR-25965 work.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/featuretable_mac.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 45090c4c31..e2b979d9e9 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 24
+version 23
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
@@ -282,7 +282,6 @@ list TexUnit8orLess
RenderDeferredSSAO 0 0
list ATI
-RenderDeferred 0 0
RenderDeferredSSAO 0 0
list Intel