diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-11-11 19:19:07 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-11-11 19:19:07 +0200 |
| commit | 14c668bb976a651deef5d275c4e5f15f7d4bfea2 (patch) | |
| tree | a1966b30aa4c4509972bcd6a5ccc47af9d08e933 /indra/newview | |
| parent | b8a672adaf547649d555909f1baa2234d4b46699 (diff) | |
fixed reopened subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from "Second Life", zero uuid)
now not counting messages with from = "Second Life" and from_id = receiver's uuid
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e894022e52..60faaea2c5 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -439,8 +439,11 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co addToHistory(session_id, from, from_id, utf8_text); if (log2file) logToFile(session_id, from, from_id, utf8_text); - //we do not count system messages - if (from_id.notNull()) session->mNumUnread++; + //we do not count system messages and our messages + if (from_id.notNull() && from_id != gAgentID && SYSTEM_FROM != from) + { + session->mNumUnread++; + } // notify listeners LLSD arg; |