diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-31 08:20:33 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-31 08:20:33 -0800 |
| commit | 22835e1ddb39341df26681dde8d22c673cc3940b (patch) | |
| tree | eedbeeb4a84d61fb9d163b6cfd95d872eb26d7a7 /indra/newview/llconversationlog.cpp | |
| parent | faae38daaaf30fd96b217316cf3eafb095ff35bc (diff) | |
| parent | 0aa68e46fb67db3c90ac3d193bfa99509dca8100 (diff) | |
Pull merge with lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 8de041f983..c68a96ef5d 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -194,6 +194,7 @@ LLConversationLog::LLConversationLog() : if (log_mode > 0) { + loadFromFile(getFileName()); keep_log_ctrlp->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2)); enableLogging(log_mode); } @@ -203,8 +204,6 @@ void LLConversationLog::enableLogging(S32 log_mode) { if (log_mode > 0) { - loadFromFile(getFileName()); - LLIMMgr::instance().addSessionObserver(this); mNewMessageSignalConnection = LLIMModel::instance().addNewMsgCallback(boost::bind(&LLConversationLog::onNewMessageReceived, this, _1)); @@ -229,7 +228,7 @@ void LLConversationLog::logConversation(const LLUUID& session_id, BOOL has_offli const LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(session_id); LLConversation* conversation = findConversation(session); - if (session) + if (session) { if (conversation) { |