diff options
| author | angela <angela@lindenlab.com> | 2010-02-16 20:36:26 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-16 20:36:26 +0800 |
| commit | 2582f759b8d73fe197e294c3a1d6cdd48e666d84 (patch) | |
| tree | 8570901f13dfa63c43634651674c7f3a1dae5761 /indra/newview/llimfloater.cpp | |
| parent | 4a9c68d8e66e3ff223885a455fe385e0ba51939b (diff) | |
| parent | e3367fad368660bf40db29a82237475a9f2dfdbd (diff) | |
merge with remote repo
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 6 |
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(); |