diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-15 09:55:00 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-15 09:55:00 +0200 |
| commit | f8f1252d32824d99e6f51fd1ea9789c1097f44de (patch) | |
| tree | 64833731c268542f054c5d7db6787117ea22f3ac | |
| parent | fc3b068d2ef05f95e579876b68d3e17c8425bc14 (diff) | |
mplemented EXT-3396 “All bottom bar buttons, including chiclets and nearby chat, should work as toggles”,
made hide/unhide dockable floaters when undocked;
--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 |