summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-08-15 18:51:20 -0700
committerAura Linden <aura@lindenlab.com>2014-08-15 18:51:20 -0700
commitb12e241751bef94cecb99e5577f1a75f0cbe2147 (patch)
tree604b57deabdcb2b0393dc08ffe2ac92192ecb6da /indra/newview/app_settings
parent370aa671c66cfd5e2a338602d2e9765e9ea103f8 (diff)
parent7060527bbc9a7a76cbc3b4b9bb772cb90542fd60 (diff)
Merged with windows fixes.
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 757539ee74..fa348e0bcd 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13501,7 +13501,7 @@
<key>VivoxDebugLevel</key>
<map>
<key>Comment</key>
- <string>Logging level to use when launching the vivox daemon SPATTERS FIX VALUE BEFORE CHECKIN</string>
+ <string>Logging level to use when launching the vivox daemon</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -13518,7 +13518,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>500</string>
+ <string>5</string>
</map>
<key>VivoxDebugSIPURIHostName</key>
<map>