summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-02-15 18:14:51 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-02-15 18:14:51 +0200
commit61e799a4434dcfb77b0cbd25d454a4f82c7fca75 (patch)
tree94c960df3b3142338c8860f48b27abf3c22dbd7d /indra/newview
parent9b001fad99399fcbf6705063d5ac678f5adaf22f (diff)
fixed EXT-5428 Detached IM window doesn't show received messages.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimfloater.cpp7
1 files changed, 7 insertions, 0 deletions
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();
}