From 75406641836fee796428216df82b7e29ad24443a Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Wed, 13 Aug 2014 18:12:25 -0700
Subject: Ported from defective branch.

---
 indra/newview/app_settings/settings.xml | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'indra/newview/app_settings')

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>
-- 
cgit v1.2.3