summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
committerPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
commit85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch)
treedbb248900527cac25c307970fb5c817b90b715e7 /indra/newview/app_settings/settings.xml
parentee159d8e742a7281f304fc45b692c111706d294e (diff)
parent9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff)
Merge of viewer 2 changes
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b301d784f9..4ed2927ce6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7441,7 +7441,19 @@
<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>SafeMode</key>
<map>
<key>Comment</key>
<string>Reset preferences, run in safe mode.</string>