diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-12-19 06:00:48 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-12-19 06:00:48 -0800 |
| commit | b0f590f6ab4033503ff9d80e2374e374397d40fb (patch) | |
| tree | 97e9758c011105b48218cbd2e611c51cc967520d /indra/newview/app_settings/settings.xml | |
| parent | d0d5a6a15cf3c573c89ce590030c7a150b19dd05 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 287dd5d29e..4a106c08e4 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6182,7 +6182,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>30.0</real> + <real>600.0</real> </map> <key>MemoryPrivatePoolEnabled</key> <map> @@ -13565,6 +13565,28 @@ <key>Value</key> <string>0</string> </map> + <key>VivoxLogDirectory</key> + <map> + <key>Comment</key> + <string>Default log path is Application Support/SecondLife/logs specify alternate absolute path here.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string></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>5</string> + </map> <key>VivoxDebugSIPURIHostName</key> <map> <key>Comment</key> |