livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed normal bug (EXT-2454) "Unread message" indicator isn't reset for chiclet in the Message Well after opening IM window 

added a check, whether a new message came, in order to prevent unwanted return from function, that makes impossible updating chiclets' states

--HG--
branch : product-engine
meow-7.2.2
Dmitry Oleshko 2009-11-13 14:50:52 +02:00
parent fc9741f9ae
commit 03a0b86335
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llchiclet.cpp
View File

@ -838,11 +838,15 @@ void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){
LLUUID session_id = data["session_id"].asUUID();
LLUUID from_id = data["from_id"].asUUID();
const std::string from = data["from"].asString();
//we do not show balloon (indicator of new messages) for system messages and our own messages
if (from_id.isNull() || from_id == gAgentID || SYSTEM_FROM == from) return;
S32 unread = data["num_unread"].asInteger();
// if new message came
if(unread != 0)
{
//we do not show balloon (indicator of new messages) for system messages and our own messages
if (from_id.isNull() || from_id == gAgentID || SYSTEM_FROM == from) return;
}
LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
if (im_floater && im_floater->getVisible())
{
@ -862,7 +866,6 @@ void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){
llwarns << "Unable to set counter for chiclet " << session_id << llendl;
}
}
}