summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-19 19:25:58 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-19 19:25:58 -0700
commitc8857cc72270479ed3a5a04b14be3361b2eafea9 (patch)
tree37bb3acb545424c136c716186bc91f98adfd3d00 /indra/newview/app_settings
parent49596f4b7fca83dbd7e49ee0780ac6f5574a5746 (diff)
CHUI-142 : Changes to chat related preferences
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml15
1 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 46c29e32e2..feb80a3611 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1538,7 +1538,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>ChatBubbleOpacity</key>
<map>
@@ -1617,17 +1617,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>ChatWindow</key>
- <map>
- <key>Comment</key>
- <string>Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>CheesyBeacon</key>
<map>
<key>Comment</key>
@@ -9809,7 +9798,7 @@
<key>ShowScriptErrorsLocation</key>
<map>
<key>Comment</key>
- <string>Show script error in chat or window</string>
+ <string>Show script error in chat (0) or window (1).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>