diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 10:28:35 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 10:28:35 +0000 |
commit | aa7fadfde02d396ab04c82f91f01d486b4f5396d (patch) | |
tree | 21e0e919da0ad23f3a39b5128ba5313f0f8a78d5 /indra/newview/app_settings/settings.xml | |
parent | e3367fad368660bf40db29a82237475a9f2dfdbd (diff) | |
parent | 9c5e4d315a4b5f5a0793587c6a6620f6efc76332 (diff) |
merge from viewer2.
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c0cf8ec1ad..48c74ade02 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7397,8 +7397,19 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> + <key>RenderUseTriStrips</key> + <map> + <key>Comment</key> + <string>Use triangle strips for rendering prims.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RenderUseFarClip</key> <map> <key>Comment</key> @@ -7542,7 +7553,30 @@ <key>Value</key> <integer>0</integer> </map> - <key>SafeMode</key> + <key>MeshThreadCount</key> + <map> + <key>Comment</key> + <string>Number of threads to use for loading meshes.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>8</integer> + </map> + <key>MeshMaxConcurrentRequests</key> + <map> + <key>Comment</key> + <string>Number of threads to use for loading meshes.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>32</integer> + </map> + + <key>SafeMode</key> <map> <key>Comment</key> <string>Reset preferences, run in safe mode.</string> @@ -10103,7 +10137,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>SpeakerParticipantRemoveDelay</key> <map> |