diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-31 10:04:15 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-31 10:04:15 +0200 |
| commit | a12200b91b0ca20dfff2df8aa71c6f53ac0603ee (patch) | |
| tree | 09b0a13db6ba436d534caf544b48ccf70be1f97c /indra/newview | |
| parent | 84148762d974e728dbcb33f16aa641054ab0b641 (diff) | |
CHUI-718 (User does not see own chat in conference IM)
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 772753e7d1..fb654985e5 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -229,7 +229,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 && session->mOtherParticipantID != gAgentID) { if (conversation) { diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 5dd5704916..3f9fb02368 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2545,12 +2545,6 @@ void LLIMMgr::addMessage( { 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()) { |