summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-03-21 17:40:49 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-03-21 17:40:49 -0400
commitfa4359e571fb67aca651efc3403274cdf0bb2616 (patch)
tree029261cf0981e0472f2bd34bbae20dbcfbc26925 /indra/newview/app_settings
parent3f3429fa6854c6462abf3bbabf4af1dbbeb4c337 (diff)
parentb9a9b0017dd4714cbca4b0ddb69ed5e6b2f09528 (diff)
STORM-1051: merge daggy fix to tip
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6630d8f400..a94ff89a8e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2601,10 +2601,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>DisableRendering</key>
+ <key>HeadlessClient</key>
<map>
<key>Comment</key>
- <string>Disable GL rendering and GUI (load testing)</string>
+ <string>Run in headless mode by disabling GL rendering, keyboard, etc</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -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>