From 14c668bb976a651deef5d275c4e5f15f7d4bfea2 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 11 Nov 2009 19:19:07 +0200
Subject: 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
---
indra/newview/llimview.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
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;
--
cgit v1.2.3