From a12200b91b0ca20dfff2df8aa71c6f53ac0603ee Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Thu, 31 Jan 2013 10:04:15 +0200
Subject: [PATCH] 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)
---
indra/newview/llconversationlog.cpp | 2 +-
indra/newview/llimview.cpp | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index 772753e7d11..fb654985e58 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 5dd5704916f..3f9fb02368f 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())
{
--
GitLab