diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 21:42:27 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 21:42:27 -0800 |
| commit | 884a9887a7a9e833478d266ddf8a7808cdba2ae6 (patch) | |
| tree | 459955d55e0d7fb18a4a9ba92531f99cabeac0f5 /indra/newview/app_settings | |
| parent | 7803ba8e0c9e3618bdc2f98289293db36544331d (diff) | |
Changes to IM Logging, includes preference changes
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 24 |
2 files changed, 2 insertions, 35 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 74ae8db0c7..c7279a2e33 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3620,7 +3620,7 @@ <key>Value</key> <string /> </map> - <key>IMInChatConsole</key> + <key>IMInChat</key> <map> <key>Comment</key> <string>Copy IM into chat console</string> @@ -3629,17 +3629,6 @@ <key>Type</key> <string>Boolean</string> <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> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 893e7acd7a..af5fa4f388 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -22,17 +22,6 @@ <key>Value</key> <string>|TOKEN COPY BusyModeResponse|</string> </map> - <key>IMLogOptions</key> - <map> - <key>Comment</key> - <string>Log options for Instant Messages</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>2</integer> - </map> <key>InstantMessageLogFolder</key> <map> <key>Comment</key> @@ -75,18 +64,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> - </map> - <key>LogChatIM</key> - <map> - <key>Comment</key> - <string>Log Incoming Instant Messages with Chat</string> - <key>Persist</key> <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> </map> <key>LogTimestamp</key> <map> @@ -97,7 +75,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>LogInstantMessages</key> <map> |