summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2009-12-15 17:45:10 -0600
committerDave Parks <davep@lindenlab.com>2009-12-15 17:45:10 -0600
commitb6af8aae5b0cccfb6653d84e2020557c2be945ce (patch)
tree8f495acf9360c95aca0c002bcf704ba169ab58ce /indra/newview/app_settings/settings.xml
parentde38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (diff)
parent081fa98a47d2b592ada0fbb049ff959ac2cd6294 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index cc19578386..d1ec04842e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7495,6 +7495,17 @@
<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>
@@ -10063,7 +10074,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
<key>UseStartScreen</key>
<map>