diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
| commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
| tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/newview/llchiclet.cpp | |
| parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
| parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) | |
automated merge viewer2.0->viewer2.0
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; } |