diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
| commit | 8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch) | |
| tree | d7f5f6de35c99ca645e48dc8817d908cc6d2f348 /indra/newview/app_settings | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
svn merge -r124872:124873
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a
QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
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> |