From 780fe4e37fe5df4120ef4de09e6fc69f6184e4d3 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 15 Mar 2013 17:39:09 +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 | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a266f06a20a..aadc61c4f5c 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -287,9 +287,22 @@ void on_new_message(const LLSD& msg)
//Surface conversations floater
LLFloaterReg::showInstance("im_container");
im_box->collapseMessagesPane(false);
- if (session_floater && session_floater->isMinimized())
+ if (session_floater)
{
- LLFloater::onClickMinimize(session_floater);
+ if (session_floater->getHost())
+ {
+ if (NULL != im_box && im_box->isMinimized())
+ {
+ LLFloater::onClickMinimize(im_box);
+ }
+ }
+ else
+ {
+ if (session_floater->isMinimized())
+ {
+ LLFloater::onClickMinimize(session_floater);
+ }
+ }
}
}
--
GitLab