diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 09:45:25 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 09:45:25 +0000 |
| commit | e3367fad368660bf40db29a82237475a9f2dfdbd (patch) | |
| tree | fae2860b9a165fcb2ee4b8834a8b7fac6ff691cf /indra/newview/llimfloater.cpp | |
| parent | c892ac9313071f3e00e680a0bda6441adcc0e405 (diff) | |
| parent | 481e26ae2db0415226a04eec3b3f05f9a246081d (diff) | |
PE merge.
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(); |