diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
2 files changed, 9 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) { diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 7962d7f27f..5dd5704916 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2544,6 +2544,13 @@ void LLIMMgr::addMessage( bool link_name) // If this is true, then we insert the name and link it to a profile { LLUUID other_participant_id = target_id; + + // Agent can't create session with himself + if (other_participant_id == gAgentID) + { + return; + } + LLUUID new_session_id = session_id; if (new_session_id.isNull()) { |