summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llconversationlog.cpp2
-rw-r--r--indra/newview/llimview.cpp6
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())
{