summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7ae92129dc..5ebf14d093 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4804,7 +4804,7 @@
<key>IMInChatConsole</key>
<map>
<key>Comment</key>
- <string>Copy IM into background chat console</string>
+ <string>Copy IM into chat console</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4812,6 +4812,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>IMInChatHistory</key>
+ <map>
+ <key>Comment</key>
+ <string>Copy IM into chat history</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>IMShowTimestamps</key>
<map>
<key>Comment</key>
@@ -8777,7 +8788,7 @@
<key>Comment</key>
<string>Display XUI Names as Tooltips</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>