summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-05-16 19:04:52 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-05-16 19:04:52 +0300
commit73fa7a46b54941a3f7f7745e8ae037ba49a47969 (patch)
tree42401c33beea951940c9618ffce658b94e3f1d4d /indra/newview/llimview.cpp
parent0f35d68d6ffe0485cac6309bb98b36a2578afd8f (diff)
CHUI-913 Additional fix
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp2
1 files changed, 1 insertions, 1 deletions
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())
{