summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2010-02-15 22:20:52 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2010-02-15 22:20:52 +0200
commit9c5de933878b6af68a171aa171bca2f0fe104196 (patch)
tree1294970556bd84b1ad051a1d98d1c0ba011c298c
parentef21d64c84a7dd1382ac0da1f14c7707351373fa (diff)
Fixed low bug EXT-5421 (IM floater doesn't remember minimized state when leaving mouselook)
--HG-- branch : product-engine
-rw-r--r--indra/newview/llimfloater.cpp6
1 files changed, 5 insertions, 1 deletions
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();