summaryrefslogtreecommitdiff
path: root/indra/llui/lltoolbar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-12 10:45:13 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-12 10:45:13 -0500
commit642ea00a08d454dfb4eb5278b659260803816fc2 (patch)
tree7bc0734dcd80a78a597779c70bcf6c3f8324f949 /indra/llui/lltoolbar.cpp
parent8a51346d6f0d9171263124c203b2194db914b47d (diff)
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff)
merge
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rw-r--r--indra/llui/lltoolbar.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index e7642ae190..7f96c1373c 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -770,6 +770,12 @@ void LLToolBar::updateLayoutAsNeeded()
// re-center toolbar buttons
mCenteringStack->updateLayout();
+ if (!mButtons.empty())
+ {
+ mButtonPanel->setVisible(TRUE);
+ mButtonPanel->setMouseOpaque(TRUE);
+ }
+
// don't clear flag until after we've resized ourselves, to avoid laying out every frame
mNeedsLayout = false;
}