From d8e26b7b73b734e1745795788c844f6aab3360fe Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 12 Jul 2010 11:28:51 +0300
Subject: [PATCH] EXT-8246 FIXED Disabling an adding of items into Recent
People list in case of incoming ad-hoc chat.
REASON: it was implemented in EXT-5694 to add all ad-hoc participants when user send a message to session created himself.
Participants IDs are known in this case.
But in case of incoming ad-hoc chat those IDs are not known. Container used to get IDs contains only Ad-hoc Session ID.
So, (???) is expected in this case in Recent People Panel.
FIX: disabling adding of items into Recent People list in case of incoming ad-hoc chat.
Note: participants will be added to the list once they send a message to chat.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/724/
--HG--
branch : product-engine
---
indra/newview/llimview.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a2b72e7d74e..21313f9df70 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1022,6 +1022,14 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
}
else
{
+ // IM_SESSION_INVITE means that this is an Ad-hoc incoming chat
+ // (it can be also Group chat but it is checked above)
+ // In this case mInitialTargetIDs contains Ad-hoc session ID and it should not be added
+ // to Recent People to prevent showing of an item with (???)(???). See EXT-8246.
+ // Concrete participants will be added into this list once they sent message in chat.
+ if (IM_SESSION_INVITE == dialog) return;
+
+ // implemented adding of all participants of an outgoing to Recent People List. See EXT-5694.
for(uuid_vec_t::iterator it = session->mInitialTargetIDs.begin();
it!=session->mInitialTargetIDs.end();++it)
{
--
GitLab