diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 08:56:49 -0700 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 08:56:49 -0700 |
commit | 6098fd2ebcd1bd78a8f8c638f707e8a14033df9b (patch) | |
tree | 9e296f4096ee670237e9545ee0e9c083c6ad5dbd /indra/newview/app_settings/settings.xml | |
parent | f1a1f613cf035d9c8e15c03bac7b00972eb3bb66 (diff) | |
parent | 5fd6887477b61e10ffd29086b9330a54b3a571d2 (diff) |
Automated merge with ssh://hg.lindenlab.com/brad/viewer-dev
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1eb3732e65..d51498f6d1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8184,6 +8184,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>RenderUseStreamVBO</key> + <map> + <key>Comment</key> + <string>Use VBO's for stream buffers</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RenderVolumeLODFactor</key> <map> <key>Comment</key> @@ -11393,9 +11404,9 @@ <key>Persist</key> <integer>0</integer> <key>Type</key> - <string>Boolean</string> + <string>S32</string> <key>Value</key> - <integer>0</integer> + <integer>-1</integer> </map> <key>WaterEditPresets</key> <map> |