diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-08-05 08:33:21 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-08-05 08:33:21 -0700 |
| commit | ea50327a27299efca6a1451b1b2e37aab2113297 (patch) | |
| tree | 8e62bc52d132366a7b81cdfd7590d14db9d17bed /indra/newview/app_settings | |
| parent | db43a0560c259623a1a8022668f8482d82cae9c8 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Merge to 3.7.14
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 49403d45c0..8895bba472 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6140,16 +6140,16 @@ <integer>0</integer> </map> <key>MemoryLogFrequency</key> - <map> - <key>Comment</key> - <string>Seconds between display of Memory in log (0 for never)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>600.0</real> - </map> + <map> + <key>Comment</key> + <string>Seconds between display of Memory in log (0 for never)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>30.0</real> + </map> <key>MemoryPrivatePoolEnabled</key> <map> <key>Comment</key> |