diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-08-13 18:12:25 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-08-13 18:12:25 -0700 |
| commit | 75406641836fee796428216df82b7e29ad24443a (patch) | |
| tree | b32265a1d6fc6010a0976680e5320b7a7c1557b2 /indra/newview/app_settings | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Ported from defective branch.
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 000362ebfd..757539ee74 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6118,16 +6118,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>30.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>600.0</real> + </map> <key>MemoryPrivatePoolEnabled</key> <map> <key>Comment</key> @@ -13501,7 +13501,7 @@ <key>VivoxDebugLevel</key> <map> <key>Comment</key> - <string>Logging level to use when launching the vivox daemon</string> + <string>Logging level to use when launching the vivox daemon SPATTERS FIX VALUE BEFORE CHECKIN</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -13509,6 +13509,17 @@ <key>Value</key> <string>0</string> </map> + <key>VivoxShutdownTimeout</key> + <map> + <key>Comment</key> + <string>shutdown timeout in miliseconds. The amount of time to wait for the service to shutdown gracefully after the last disconnect</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>500</string> + </map> <key>VivoxDebugSIPURIHostName</key> <map> <key>Comment</key> |