summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-11 13:38:19 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-11 13:38:19 -0400
commitf1e907ecbeb43d56066bc365a4550931dfc5e7eb (patch)
tree5642c656a58e6c68897b6196c2991892c4009d00 /indra/newview/app_settings
parentd7f123ab526df7dbef153e0de71f325ab1b69571 (diff)
parentbe251b06eb785a2d301115f9c231eb5f3c906224 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/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 1b539fe0db..12a8d297e7 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5657,6 +5657,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>MemoryPrivatePoolSize</key>
+ <map>
+ <key>Comment</key>
+ <string>Size of the private memory pool in MB (min. value is 256)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>512</integer>
+ </map>
<key>MemProfiling</key>
<map>
<key>Comment</key>
@@ -13564,7 +13575,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>ShowOfferedInventory</key>
<map>