diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-19 12:05:15 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-19 12:05:15 -0400 |
| commit | 1e50e4a13a37a236470e088c32c40ff62d46d497 (patch) | |
| tree | 08c0d4ee106f40e8f2d11ab89df83bae7a6704f4 /indra/newview/llchiclet.cpp | |
| parent | 637105e5cf346e5a88fe5820f36f6233b404d5aa (diff) | |
| parent | 7d50a19d6cb46b60ba005280223522672736592d (diff) | |
Merge
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; } |