diff options
author | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:11:23 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:11:23 -0400 |
commit | 2e26a75215bb2d708671d71c5c66e2996c11495f (patch) | |
tree | c2cdcbf4758462b11f296c9ab200237aa33e5c71 /indra/newview/app_settings/settings.xml | |
parent | a69ae967243e19bdc5969c34f0b1e94be794919d (diff) | |
parent | aabdbeadf53b3a20b4db563a23535af74fd7d4b7 (diff) |
merge changes for vwr-27090
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8804c40aff..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> @@ -13564,7 +13575,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>ShowOfferedInventory</key> <map> |