summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-05 09:03:24 -0400
committerOz Linden <oz@lindenlab.com>2011-10-05 09:03:24 -0400
commit194bedbb96a6dcfe90d5b731aeca8658c83f2306 (patch)
treee17372f3b592f8932dbe171c41393e56807f22ce /indra/newview/app_settings
parentd0e36ade5bb16e9e5a6aca9ee4f02fbe995cdfd8 (diff)
parent616a7b549d21624e6667218efe29c1e552f9b375 (diff)
merge changes for vwr-26864
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index be4ec93946..15f1bbd1b1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5657,6 +5657,17 @@
<key>Value</key>
<integer>1</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>