diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
commit | bd02cdc75f1c752a127d1303527be3a96479af93 (patch) | |
tree | d8503b7c296a4cd4f1aa2954c03ff250beda4254 /indra/newview/app_settings/settings.xml | |
parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
parent | 8dbfa022778f2a7fcd5d2b527045724551279412 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8804c40aff..ddc4f4ddd2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8673,6 +8673,17 @@ <key>Value</key> <real>1.0</real> </map> + <key>RenderGLCoreProfile</key> + <map> + <key>Comment</key> + <string>Don't use a compatibility profile OpenGL context. Requires restart. Basic shaders MUST be enabled.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RenderGlow</key> <map> <key>Comment</key> @@ -9276,6 +9287,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>RenderUseVAO</key> + <map> + <key>Comment</key> + <string>Use GL Vertex Array Objects</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RenderVBOMappingDisable</key> <map> <key>Comment</key> @@ -9285,7 +9307,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>RenderUseStreamVBO</key> <map> |