diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:33:19 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:33:19 -0500 |
| commit | cd64ae7fb8ee781a5bf9ac47dd2428e659b939c9 (patch) | |
| tree | 9638dfe3ce3a7d5399d6f52552c9e1e3f308fd46 /indra/newview/lltoolbarview.cpp | |
| parent | e4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (diff) | |
| parent | 2abb1a81c56a27eab02157851cb9e67730231bb6 (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/lltoolbarview.cpp')
| -rw-r--r-- | indra/newview/lltoolbarview.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 5ff0ccfeb2..eccb2cf2f1 100644 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -73,6 +73,7 @@ LLToolBarView::ToolbarSet::ToolbarSet() LLToolBarView::LLToolBarView(const LLToolBarView::Params& p) : LLUICtrl(p), mDragStarted(false), + mShowToolbars(true), mDragToolbarButton(NULL), mToolbarsLoaded(false) { @@ -530,6 +531,13 @@ void LLToolBarView::draw() } } + for (S32 i = TOOLBAR_FIRST; i <= TOOLBAR_LAST; i++) + { + mToolbars[i]->getParent()->setVisible(mShowToolbars + && (mToolbars[i]->hasButtons() + || isToolDragged())); + } + // Draw drop zones if drop of a tool is active if (isToolDragged()) { @@ -656,10 +664,7 @@ void LLToolBarView::resetDragTool(LLToolBarButton* toolbarButton) void LLToolBarView::setToolBarsVisible(bool visible) { - for (S32 i = TOOLBAR_FIRST; i <= TOOLBAR_LAST; i++) - { - mToolbars[i]->getParent()->setVisible(visible); - } + mShowToolbars = visible; } bool LLToolBarView::isModified() const |