diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-13 05:27:27 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-13 05:27:27 -0700 |
| commit | c201038aba861b1166d367fcf5986e33644ec018 (patch) | |
| tree | c9b0379d1936736de93ae3dc2489e54dce96e604 /indra/newview/llimview.cpp | |
| parent | b45271834161018be8c825e96c64d9ef7b67401c (diff) | |
| parent | c8602b293517dfb4d5c6658ab235af9fe9932b7e (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llimview.cpp')
| -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) { |