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

meow-7.2.2
Richard Linden 2011-12-01 10:44:33 -08:00
commit 4a74971c36
1 changed files with 5 additions and 0 deletions

View File

@ -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())
{