diff options
| author | Richard Linden <none@none> | 2011-12-06 15:35:37 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-12-06 15:35:37 -0800 |
| commit | 37ff2f2282a7b9dbac6fb8d33bf65c110347cd24 (patch) | |
| tree | 339873fbfc3c5db8f51073b0e7ce620bd1946ba9 /indra/newview | |
| parent | 71974461114d81f818f69a4344ce4071c20f331f (diff) | |
| parent | d2a0457777a81c75b18c5eb255e6e02d47f97a80 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoolbarview.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/lltoolbarview.h | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 3872444e8f..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) { @@ -532,7 +533,9 @@ void LLToolBarView::draw() for (S32 i = TOOLBAR_FIRST; i <= TOOLBAR_LAST; i++) { - mToolbars[i]->getParent()->setVisible(mToolbars[i]->hasButtons() || isToolDragged()); + mToolbars[i]->getParent()->setVisible(mShowToolbars + && (mToolbars[i]->hasButtons() + || isToolDragged())); } // Draw drop zones if drop of a tool is active @@ -661,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 diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h index b99e8bc28d..be66bcae36 100644 --- a/indra/newview/lltoolbarview.h +++ b/indra/newview/lltoolbarview.h @@ -129,6 +129,7 @@ private: bool mDragStarted; LLToolBarButton* mDragToolbarButton; + bool mShowToolbars; }; extern LLToolBarView* gToolBarView; |