diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-12 11:28:51 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-12 11:28:51 +0300 |
| commit | d8e26b7b73b734e1745795788c844f6aab3360fe (patch) | |
| tree | a79063f19ee8fbdfb98f7d7afe7f4227e81c78ce /indra/newview | |
| parent | 331ccee1f5cea9fab944c934b3beeb70fc7f6504 (diff) | |
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
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a2b72e7d74..21313f9df7 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) { |