summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-12-01 10:44:33 -0800
committerRichard Linden <none@none>2011-12-01 10:44:33 -0800
commit4a74971c36f41708d4b4cc95ffb0cfdb65e8fb15 (patch)
treeccd7ac2f1ee554fae43ea0d5ecd8ade4d8ceaebb /indra
parent770538f992a42cdda091f93e8b318e35372aaad2 (diff)
parent03eca4ac461927e9d053941982d774690ffed176 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lltoolbarview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 5ff0ccfeb2..3872444e8f 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -530,6 +530,11 @@ void LLToolBarView::draw()
}
}
+ for (S32 i = TOOLBAR_FIRST; i <= TOOLBAR_LAST; i++)
+ {
+ mToolbars[i]->getParent()->setVisible(mToolbars[i]->hasButtons() || isToolDragged());
+ }
+
// Draw drop zones if drop of a tool is active
if (isToolDragged())
{