diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 17:54:51 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 17:54:51 +0200 |
| commit | a85497f598d599c6de0cc0d79170aca0728c85b1 (patch) | |
| tree | 816ac487c9a2966da3ff48ff411e7b61028c4712 /indra/newview | |
| parent | 30c586e77031f0c9141e8b8b96c344a6a9007876 (diff) | |
| parent | b5ba328480b0d42343fa02219b98c017f3ac0aad (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-offers/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index cb3d52fe13..ae41e673bf 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -244,8 +244,13 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type, // set searched session as active to avoid IM toast popup LLIMModel::instance().setActiveSessionID(session_id); + S32 unread = session->mNumUnread; + S32 participant_unread = session->mParticipantUnreadMessageCount; LLIMModel::instance().addMessageSilently(session_id, from, from_id, message); + // we shouldn't increment counters when logging, so restore them + session->mNumUnread = unread; + session->mParticipantUnreadMessageCount = participant_unread; // restore active session id if (active_session_id.isNull()) |