summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-07-20 16:05:19 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-07-20 16:05:19 -0600
commit48d949150cd445ce1e801a7a8ee67597a965f14b (patch)
treeba04dbf2438246c5b2842ae4aa5348ee7556ed7a /indra/newview/app_settings
parentf7861eaf4e50ca2b868179ced6258f9d936a2b9c (diff)
add a debug setting "MemoryPrivatePoolEnabled" to turn on/off private memory pool.
Diffstat (limited to 'indra/newview/app_settings')
-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 8ff5341297..9c065537e5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5561,7 +5561,7 @@
<key>Comment</key>
<string>If set, the viewer will quit to avoid crash when memory failure happens</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
@@ -5578,6 +5578,17 @@
<key>Value</key>
<real>600.0</real>
</map>
+ <key>MemoryPrivatePoolEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable the private memory pool management</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>MemProfiling</key>
<map>
<key>Comment</key>