summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-15 15:43:47 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-15 15:43:47 -0700
commitff5e3f5c2e566f3a8e86efaa763f7b12e07eeb53 (patch)
treec23c06d0006a773508e053263d1c7f65a1c5008f /indra/newview/app_settings/settings.xml
parent3555849644ff228a189dd2a21e57def22f142e5d (diff)
parentf13884e528c327dbbc638b72322e08b544d0f6c0 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-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..58abd4c091 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>0</integer>
+ </map>
<key>RenderUseStreamVBO</key>
<map>
<key>Comment</key>