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/llimview.cpp | |
parent | 7803ba8e0c9e3618bdc2f98289293db36544331d (diff) |
Changes to IM Logging, includes preference changes
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 54b7c124e0..c066f1f77a 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -395,21 +395,15 @@ bool LLIMModel::addToHistory(const LLUUID& session_id, const std::string& from, bool LLIMModel::logToFile(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text) { - S32 im_log_option = gSavedPerAccountSettings.getS32("IMLogOptions"); - if (im_log_option != LOG_CHAT) + if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) { - if(im_log_option == LOG_BOTH_TOGETHER) - { - LLLogChat::saveHistory(std::string("chat"), from, from_id, utf8_text); - return true; - } - else - { - LLLogChat::saveHistory(LLIMModel::getInstance()->getName(session_id), from, from_id, utf8_text); - return true; - } + LLLogChat::saveHistory(LLIMModel::getInstance()->getName(session_id), from, from_id, utf8_text); + return true; + } + else + { + return false; } - return false; } bool LLIMModel::proccessOnlineOfflineNotification( |