diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
| commit | d603085c0332f5d615cc6583e13ed0aa5ab21908 (patch) | |
| tree | bac8d5e6b99643448579060d38a2e69fab65caf7 /indra/newview/llimview.cpp | |
| parent | 474457ea7ea1bd178682788426a4cf40c3fffdcd (diff) | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
Merge with dessie/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 8fbd8fc2aa..7c951e3556 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1031,6 +1031,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) { |