diff options
| author | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 11:23:33 -0600 |
|---|---|---|
| committer | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 11:23:33 -0600 |
| commit | 6d4b4762d1eb0a1431e1793a7254f8cac220062a (patch) | |
| tree | 1076c9227658d6637a424f9266bf3832f371aaaa /indra/newview/app_settings/settings.xml | |
| parent | bc7f2e41fd268895774f9ddffd45be318662dcaa (diff) | |
| parent | 4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 93165cf5ed..cccf95c54c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7540,7 +7540,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> @@ -10134,7 +10157,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>SpeakerParticipantRemoveDelay</key> <map> |