summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-22 13:29:22 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-22 13:29:22 -0700
commite216fabde0b23923a3fff5c5edcb6a6a0be10ddd (patch)
treee5ebd5c2ee0d74fbdeb778404dbe0964da5ef910 /indra/newview/app_settings
parent1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff)
parent2ebcf802cbec59b4d9fe404af5bd125818d4eefa (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6630d8f400..a010524091 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8451,6 +8451,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>RenderVBOMappingDisable</key>
+ <map>
+ <key>Comment</key>
+ <string>Disable VBO glMapBufferARB</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>RenderUseStreamVBO</key>
<map>
<key>Comment</key>