From dd437009e88954fd0fe9dd95b903dbd1ea52e901 Mon Sep 17 00:00:00 2001
From: Monroe Williams <monroe@lindenlab.com>
Date: Fri, 27 Feb 2009 21:01:19 +0000
Subject: svn merge -r 113014:113017
 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323

Merging in QAR-1323.
---
 indra/newview/app_settings/settings.xml | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 523032bf67..e964799e4c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10198,6 +10198,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>VivoxAutoPostCrashDumps</key>
+    <map>
+      <key>Comment</key>
+      <string>If true, SLVoice will automatically send crash dumps directly to Vivox.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>VivoxDebugLevel</key>
     <map>
       <key>Comment</key>
@@ -10209,16 +10220,27 @@
       <key>Value</key>
       <string>-1</string>
     </map>
-    <key>VivoxDebugServerName</key>
+    <key>VivoxDebugSIPURIHostName</key>
+    <map>
+      <key>Comment</key>
+      <string>Hostname portion of vivox SIP URIs (empty string for the default).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
+    </map>
+    <key>VivoxDebugVoiceAccountServerURI</key>
     <map>
       <key>Comment</key>
-      <string>Hostname of the vivox account server to use for voice when not connected to Agni.</string>
+      <string>URI to the vivox account management server (empty string for the default).</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>bhd.vivox.com</string>
+      <string></string>
     </map>
     <key>VoiceCallsFriendsOnly</key>
     <map>
@@ -10361,7 +10383,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>44124</integer>
+      <integer>44125</integer>
     </map>
     <key>WLSkyDetail</key>
     <map>
-- 
cgit v1.3