diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-05-15 14:57:11 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-05-15 14:57:11 +0300 |
| commit | 0f35d68d6ffe0485cac6309bb98b36a2578afd8f (patch) | |
| tree | 82419a085ad03f530d6eb5f3cfae4cdca1154cd6 /indra | |
| parent | 36a51f4927eb1bba511b73613a7f9baeddf467fd (diff) | |
CHUI-913 FIXED Show toasts for torn-off windows that aren't collapsed.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index 9ce5e12897..0b183bf51c 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -606,6 +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()) || ((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 214b177a1b..2552ddbb1e 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -314,7 +314,8 @@ 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)) + (ON_TOP_AND_ITEM_IS_SELECTED != conversations_floater_status) && + (!session_floater->isTornOff())) || !session_floater->isMessagePaneExpanded()) { |