livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience

meow-7.2.2
Richard Linden 2011-12-06 15:35:37 -08:00
parent 7197446111 d2a0457777
commit 37ff2f2282
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/lltoolbarview.cpp
View File

@ -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

1
indra/newview/lltoolbarview.h
View File

@ -129,6 +129,7 @@ private:
bool mDragStarted;
LLToolBarButton* mDragToolbarButton;
bool mShowToolbars;
};
extern LLToolBarView* gToolBarView;