From bd8b0de8970387d2660af10220bbe53901c4aaed Mon Sep 17 00:00:00 2001
From: alexanderpproductengine <alexanderpproductengine@lindenlab.com>
Date: Wed, 13 Mar 2013 22:18:41 +0200
Subject: [PATCH] CHUI-831 ADD FIX Minimized conversation floater is not opened
with Open Conversation Window preference if conversation receiving message is
selected
---
indra/newview/llimview.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index d04e76c0b3a..a266f06a20a 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -199,13 +199,13 @@ void on_new_message(const LLSD& msg)
// execution of the action
LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
-
- if (im_box->isFrontmost() && im_box->getSelectedSession() == session_id)
+ LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id);
+
+ if (im_box->isFrontmost() && im_box->getSelectedSession() == session_id
+ && !(session_floater->getHost() ? im_box->isMinimized() : session_floater->isMinimized()))
{
return;
}
-
- LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id);
//session floater not focused (visible or not)
bool session_floater_not_focused = session_floater && !session_floater->hasFocus();
--
GitLab