summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-12-15 09:55:00 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-12-15 09:55:00 +0200
commitf8f1252d32824d99e6f51fd1ea9789c1097f44de (patch)
tree64833731c268542f054c5d7db6787117ea22f3ac /indra/llui
parentfc3b068d2ef05f95e579876b68d3e17c8425bc14 (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
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lldockablefloater.cpp11
1 files changed, 9 insertions, 2 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);
+ }
}
}