diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-05-16 19:04:52 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-05-16 19:04:52 +0300 |
| commit | 73fa7a46b54941a3f7f7745e8ae037ba49a47969 (patch) | |
| tree | 42401c33beea951940c9618ffce658b94e3f1d4d /indra | |
| parent | 0f35d68d6ffe0485cac6309bb98b36a2578afd8f (diff) | |
CHUI-913 Additional fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index 0b183bf51c..cc00b6fd10 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -606,7 +606,7 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg, //Don't show nearby toast, if conversation is visible and selected if ((nearby_chat->hasFocus()) || - (nearby_chat->isTornOff() && !nearby_chat->isMinimized()) || + (LLFloater::isVisible(nearby_chat) && nearby_chat->isTornOff() && !nearby_chat->isMinimized()) || ((im_box->getSelectedSession().isNull() && ((LLFloater::isVisible(im_box) && !im_box->isMinimized() && im_box->isFrontmost()) || (LLFloater::isVisible(nearby_chat) && !nearby_chat->isMinimized() && nearby_chat->isFrontmost()))))) diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 2552ddbb1e..ff163f5b25 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -315,7 +315,7 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg) // 4. Toast if ((("toast" == user_preferences) && (ON_TOP_AND_ITEM_IS_SELECTED != conversations_floater_status) && - (!session_floater->isTornOff())) + (!session_floater->isTornOff() || !LLFloater::isVisible(session_floater))) || !session_floater->isMessagePaneExpanded()) { |