diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 08:16:47 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 08:16:47 +0200 |
| commit | b96f04a1bb0577d42059246d15c244702ff02f88 (patch) | |
| tree | dfba93becc5267b14e5d83291251cb7b796dfc07 | |
| parent | daa9db305a5ae2c0c5b0c2425d6482de6dee7b2c (diff) | |
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
2 files changed, 8 insertions, 1 deletions
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()) { |