diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-23 14:16:49 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-23 14:16:49 -0700 |
| commit | 873d03e96f8fe10705e99a5ef1c1baca96fb2325 (patch) | |
| tree | 94914fe6a2eaf5d748dbfea62c75de06afa95e96 /indra/newview/llimconversation.cpp | |
| parent | 52a8ea96a1b9ad52a01c4617de63f8cc1bec1e31 (diff) | |
| parent | a780eb1a92811c2531c2fc1d211e8e5dd03da103 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/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 bd2a2419a8..74bf8cb6fe 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -202,16 +202,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(); |