From b96f04a1bb0577d42059246d15c244702ff02f88 Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Wed, 30 Jan 2013 08:16:47 +0200
Subject: [PATCH] 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(-)
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index ff1f819d7d9..65374b67f81 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 cb03c1d2343..4c3d385d2dd 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())
{
--
GitLab