From 61e799a4434dcfb77b0cbd25d454a4f82c7fca75 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Mon, 15 Feb 2010 18:14:51 +0200 Subject: fixed EXT-5428 Detached IM window doesn't show received messages. --HG-- branch : product-engine --- indra/newview/llimfloater.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llimfloater.cpp') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 94b540a7e1..52312b87a5 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -514,6 +514,13 @@ BOOL LLIMFloater::getVisible() // Treat inactive floater as invisible. bool is_active = im_container->getActiveFloater() == this; + + //torn off floater is always inactive + if (!is_active && getHost() != im_container) + { + return LLTransientDockableFloater::getVisible(); + } + // getVisible() returns TRUE when Tabbed IM window is minimized. return is_active && !im_container->isMinimized() && im_container->getVisible(); } -- cgit v1.2.3 From 9c5de933878b6af68a171aa171bca2f0fe104196 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Mon, 15 Feb 2010 22:20:52 +0200 Subject: Fixed low bug EXT-5421 (IM floater doesn't remember minimized state when leaving mouselook) --HG-- branch : product-engine --- indra/newview/llimfloater.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llimfloater.cpp') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 52312b87a5..8b2c5b039f 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -489,7 +489,11 @@ void LLIMFloater::setVisible(BOOL visible) channel->redrawToasts(); } - if (visible && mChatHistory && mInputEditor) + BOOL is_minimized = visible && isChatMultiTab() + ? LLIMFloaterContainer::getInstance()->isMinimized() + : !visible; + + if (!is_minimized && mChatHistory && mInputEditor) { //only if floater was construced and initialized from xml updateMessages(); -- cgit v1.2.3 From f808bafa663b5b855cbb26af552bbca1caa4c026 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Tue, 16 Feb 2010 12:47:54 +0200 Subject: =?UTF-8?q?fixed=20major=20EXT-5387=20=E2=80=9CPrivate=20IM=20Wind?= =?UTF-8?q?ow=20Steals=20Focus=20from=20Nearby=20Chat=E2=80=9D,=20prevente?= =?UTF-8?q?d=20focus=20stealing=20when=20IM=20opened=20in=20multitab=20mod?= =?UTF-8?q?e;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llimfloater.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llimfloater.cpp') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 8b2c5b039f..847695577a 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -497,7 +497,11 @@ void LLIMFloater::setVisible(BOOL visible) { //only if floater was construced and initialized from xml updateMessages(); - mInputEditor->setFocus(TRUE); + //prevent steal focus when IM opened in multitab mode + if (!isChatMultiTab()) + { + mInputEditor->setFocus(TRUE); + } } if(!visible) -- cgit v1.2.3