summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-02-06 20:17:35 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-02-06 20:17:35 +0200
commit302f57e47fdab9e043a72e6a83f0f2b1992f2a99 (patch)
treea453eff8b14cdc1b3d53980353e2f20e47012004 /indra/newview/app_settings
parent9b0404c4b5c99be3ab3591c7677f95f987056795 (diff)
CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to settings_per_account.xml
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
-rw-r--r--indra/newview/app_settings/settings_per_account.xml11
2 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fb4cc6de62..79376f7467 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4667,17 +4667,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>KeepConversationLogTranscripts</key>
- <map>
- <key>Comment</key>
- <string>Keep a conversation log and transcripts</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>2</integer>
- </map>
<key>LandBrushSize</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 6864328339..0b589e2da6 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -281,6 +281,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>KeepConversationLogTranscripts</key>
+ <map>
+ <key>Comment</key>
+ <string>Keep a conversation log and transcripts</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>2</integer>
+ </map>
<key>ShowFavoritesOnLogin</key>
<map>
<key>Comment</key>