diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:46:12 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:46:12 +0000 |
commit | 9c5e4d315a4b5f5a0793587c6a6620f6efc76332 (patch) | |
tree | 2426ebe09244c87d4f810d547e71c68345ff8bf2 /indra/newview/llimfloatercontainer.cpp | |
parent | 7286516e9193e7549c9d8ecde65df85402443fab (diff) | |
parent | f349c30d715b6d49ceaaf3d19610cbbaf982b368 (diff) |
viewer2 merge
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
-rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 49521b5987..a775115ac9 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -145,4 +145,16 @@ LLIMFloaterContainer* LLIMFloaterContainer::getInstance() return LLFloaterReg::getTypedInstance<LLIMFloaterContainer>("im_container"); } +void LLIMFloaterContainer::setMinimized(BOOL b) +{ + LLMultiFloater::setMinimized(b); + + if (isMinimized()) return; + + if (getActiveFloater()) + { + getActiveFloater()->setVisible(TRUE); + } +} + // EOF |