summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-23 12:50:17 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-23 12:50:17 -0500
commit9b50def44f8b6a477d54ae72891d4d1b1225e247 (patch)
treedf2e012ae6869ed381f6e3835b61e9cc6b9b2554 /indra/newview/app_settings/settings.xml
parentd46594bf714cd19ebcbf693463c4d39e4c771bb8 (diff)
parente216fabde0b23923a3fff5c5edcb6a6a0be10ddd (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/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 ec6b942e3e..71a611ba90 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8799,6 +8799,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>