diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-24 16:21:19 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-24 16:21:19 -0700 |
commit | 3ce756e44cca0cf6f9860871789e348647800e45 (patch) | |
tree | 4e5985b861790c6829fe8ae1482499e678cd2ef8 /indra/newview/app_settings | |
parent | ca52b0bd712483675bb04421fb4ee6881e61a135 (diff) | |
parent | 3f6208b1768a111e3d3c401b1f2aeac015782920 (diff) |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
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> |