summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-23 16:24:47 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-23 16:24:47 -0500
commit3d77dd6b5806bededd6b71402f71b9f0675c27c7 (patch)
tree5bc5fe4f3ecd3076b6b10742be252b2ff5df4a63 /indra/newview/app_settings
parent701b665ee567c8ff639fbc4b8794b9b0912a5256 (diff)
Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually.
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 71a611ba90..ec6b942e3e 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8799,17 +8799,6 @@
<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>