summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-07-10 13:31:09 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-07-10 14:24:55 +0300
commit94ef434cbfa3e1220731a9ddf53066b36bd23784 (patch)
tree81ca6dd16cde59ab5c687a0156a917765a5fd850 /indra/newview
parent47e2cc271ac924a39ef2b84a2232131120c6aa4f (diff)
#1932 Fix a case where an IM toast wasn't displayed
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimview.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index e39e0a332f..b12c2fdc52 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -372,8 +372,10 @@ 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() || !LLFloater::isVisible(session_floater)))
- || !session_floater->isMessagePaneExpanded())
+ (!session_floater->isTornOff()
+ || session_floater->isMinimized()
+ || !LLFloater::isVisible(session_floater)))
+ || !session_floater->isMessagePaneExpanded())
{
//Show IM toasts (upper right toasts)