diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-17 19:33:24 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-17 19:33:24 +0300 |
| commit | 3d2045877c07810188ecbd4aac14befea57ddfb3 (patch) | |
| tree | de67cd5aba9e7e74e6124c64da495ff220e7119e | |
| parent | 2097e61dcb6865ad4c5b6667c9032f2cef658bd6 (diff) | |
CHUI-286 ADD. FIX (Conversations floater opened by default when a new IM session is started (no IM toast shown)): repair toast's system - suppress toasts only if corresponding floater is visible
| -rw-r--r-- | indra/newview/llimfloater.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index cdd5ba6889..2efe5d94e2 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -97,12 +97,12 @@ void LLIMFloater::onFocusLost() void LLIMFloater::onFocusReceived() { - LLIMModel::getInstance()->setActiveSessionID(mSessionID); - 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); } } @@ -726,6 +726,7 @@ void LLIMFloater::setVisible(BOOL visible) LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*> (LLNotificationsUI::LLChannelManager::getInstance()-> findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID")))); + LLTransientDockableFloater::setVisible(visible); // update notification channel state |