diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-15 09:55:36 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-15 09:55:36 +0200 |
| commit | 02e5d2fd83a26d6d5e1d9639947a084bd8229b06 (patch) | |
| tree | d0fc44f43f1d46ed5fe21708b16daf95f35d1a14 | |
| parent | 929490262684270103427ad47cffece5a17f248a (diff) | |
| parent | f8f1252d32824d99e6f51fd1ea9789c1097f44de (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 9c69e4f2b6..63faf44f9d 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -98,8 +98,15 @@ void LLDockableFloater::toggleInstance(const LLSD& sdname) else if (instance != NULL) { instance->setMinimized(FALSE); - instance->setVisible(TRUE); - gFloaterView->bringToFront(instance); + if (instance->getVisible()) + { + instance->setVisible(FALSE); + } + else + { + instance->setVisible(TRUE); + gFloaterView->bringToFront(instance); + } } } diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 22d5b47ae4..7dc21e6e23 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -469,7 +469,7 @@ bool LLIMFloater::toggle(const LLUUID& session_id) if(!isChatMultiTab()) { LLIMFloater* floater = LLFloaterReg::findTypedInstance<LLIMFloater>("impanel", session_id); - if (floater && floater->getVisible() && floater->isDocked()) + if (floater && floater->getVisible()) { // clicking on chiclet to close floater just hides it to maintain existing // scroll/text entry state |