From 9e180d9c8f05349a67797db85cca3f978e81b5ce Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 27 Mar 2013 15:22:25 +0200
Subject: [PATCH] CHUI-895 FIXED Show toasts for messages if conversation is
collapsed to Input bar(regardless of other prefs).
---
indra/newview/llimview.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a84dbcd84a1..ca04d27d113 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -224,8 +224,9 @@ void on_new_message(const LLSD& msg)
// actions:
// 0. nothing - exit
- if ("none" == user_preferences ||
+ if (("none" == user_preferences ||
ON_TOP_AND_ITEM_IS_SELECTED == conversations_floater_status)
+ && session_floater->isMessagePaneExpanded())
{
return;
}
@@ -294,9 +295,10 @@ void on_new_message(const LLSD& msg)
}
// 4. Toast
- if ("toast" == user_preferences &&
+ if (("toast" == user_preferences &&
(CLOSED == conversations_floater_status
|| NOT_ON_TOP == conversations_floater_status))
+ || !session_floater->isMessagePaneExpanded())
{
//Show IM toasts (upper right toasts)
// Skip toasting for system messages and for nearby chat
--
GitLab