diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
| commit | a7a24dc2f9450e0d51e7110a7eb44e0f27a010db (patch) | |
| tree | 296b5344b33734babfde6aeecb36af2e005ddc32 /indra/newview/llimconversation.cpp | |
| parent | 480c3a1acb32e98d0d64aaf7bb70e4d61e6882f6 (diff) | |
| parent | 1a1a0b91c0c4400ec3febac183124314f9226127 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimconversation.cpp')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index f2421dd78f..3b6294f43b 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -238,16 +238,9 @@ void LLIMConversation::onFocusReceived() { setBackgroundOpaque(true); - if (mSessionID.notNull()) + if (mSessionID.notNull() && isInVisibleChain()) { - LLChicletBar::getInstance()->getChicletPanel()->setChicletToggleState(mSessionID, true); - - if (getVisible()) - { - // suppress corresponding toast only if this floater is visible and have focus - LLIMModel::getInstance()->setActiveSessionID(mSessionID); - LLIMModel::instance().sendNoUnreadMessages(mSessionID); - } + LLIMModel::instance().sendNoUnreadMessages(mSessionID); } LLTransientDockableFloater::onFocusReceived(); |