summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-03-26 16:32:38 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2010-03-26 16:32:38 +0200
commit35b5b5e2a3dceaf98fdf770d971c45b1c80116ed (patch)
tree3f34f5deff668a9a0001f79560b3823dd48d6f49 /indra/newview/llchiclet.cpp
parente962b8418f8a37c1d18743c31199dd9c33d5c74b (diff)
parent379517ce5e1535b20a94ef3a581e1b25223f8798 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r--indra/newview/llchiclet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 8efa814a2e..1f92686a43 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -1137,7 +1137,7 @@ void im_chiclet_callback(LLChicletPanel* panel, const LLSD& data){
S32 unread = data["participant_unread"].asInteger();
LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
- if (im_floater && im_floater->getVisible())
+ if (im_floater && im_floater->getVisible() && im_floater->hasFocus())
{
unread = 0;
}