From b96f04a1bb0577d42059246d15c244702ff02f88 Mon Sep 17 00:00:00 2001 From: mberezhnoy Date: Wed, 30 Jan 2013 08:16:47 +0200 Subject: CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group) --- indra/newview/llconversationlog.cpp | 2 +- indra/newview/llimview.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index ff1f819d7d..65374b67f8 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -237,7 +237,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 cb03c1d234..4c3d385d2d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2542,6 +2542,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()) { -- cgit v1.2.3 From 0aa68e46fb67db3c90ac3d193bfa99509dca8100 Mon Sep 17 00:00:00 2001 From: "maxim@mnikolenko" Date: Thu, 31 Jan 2013 14:57:09 +0200 Subject: CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will also solve problem with chui-710. --- indra/newview/llconversationlog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 772753e7d1..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)); -- cgit v1.2.3