diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-19 17:31:59 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-19 17:31:59 +0200 |
| commit | 7d50a19d6cb46b60ba005280223522672736592d (patch) | |
| tree | 0b76740c434a4959cfee0a77f6826876d3407af9 /indra/newview/llchiclet.cpp | |
| parent | a2150863f97bf4fc49ecc17a2405177abe9d8f73 (diff) | |
| parent | 2d0ca224ea7a05a38e51979d201e55b7e942c855 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 2 |
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; } |