From 3d77dd6b5806bededd6b71402f71b9f0675c27c7 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 23 Feb 2011 16:24:47 -0500
Subject: Merge: Backed out changes for STORM-336 for merge due to complexity,
 will need to apply these manually.

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings/settings.xml')

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>
-- 
cgit v1.2.3