diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-05-17 00:06:10 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-05-17 00:06:10 +0300 |
| commit | f159d1b053554d43aa19d6f38680a554f67d6e5c (patch) | |
| tree | 558357dd5a77b30717d964dba857aeb9a1e015e3 /indra/newview/llimview.cpp | |
| parent | 75f97d4ffe517d07e4b528de9e5f2d2c800510fb (diff) | |
| parent | 73fa7a46b54941a3f7f7745e8ae037ba49a47969 (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 214b177a1b..ff163f5b25 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() || !LLFloater::isVisible(session_floater))) || !session_floater->isMessagePaneExpanded()) { |