diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-03-29 15:23:17 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-03-29 15:23:17 +0200 |
| commit | a62a824efb89aff3056d0659ee2c23ad6d15eeaa (patch) | |
| tree | da86a101d358e07aa7d5578d5ffbfbb6245a2a00 /indra/newview/llimview.cpp | |
| parent | 8e3a85ed6650a4dc77bc9861dba18b06eb5e4725 (diff) | |
CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4171fa1235..6cff933de6 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -181,17 +181,16 @@ void on_new_message(const LLSD& msg) { conversations_floater_status = CLOSED; } - else if ( !im_box->hasFocus() && - (!session_floater || !LLFloater::isVisible(session_floater) - || session_floater->isMinimized() || !session_floater->hasFocus())) + else if (!session_floater || !LLFloater::isVisible(session_floater) + || session_floater->isMinimized() || !session_floater->hasFocus()) { conversations_floater_status = NOT_ON_TOP; } - else if (im_box->getSelectedSession() != session_id) + else if (session_floater->hasFocus()) { conversations_floater_status = ON_TOP; } - else + else if((session_floater->hasFocus()) && (im_box->getSelectedSession() == session_id)) { conversations_floater_status = ON_TOP_AND_ITEM_IS_SELECTED; } @@ -297,8 +296,11 @@ void on_new_message(const LLSD& msg) } // 4. Toast - if ("toast" == user_preferences + if ((("toast" == user_preferences) && + (CLOSED == conversations_floater_status + || NOT_ON_TOP == conversations_floater_status)) || !session_floater->isMessagePaneExpanded()) + { //Show IM toasts (upper right toasts) // Skip toasting for system messages and for nearby chat |