EXP-1469 FIX -- Changing toolbar from "icons only" to "icons with text" while incoming/outgoing call floater is open causes crash on mac
* Updated LLToolBar to call remove and add on all buttons when rebuilding the toolbar.master
parent
8448e3b86e
commit
a5f3c70eef
|
|
@ -824,6 +824,11 @@ void LLToolBar::createButtons()
|
|||
{
|
||||
BOOST_FOREACH(LLToolBarButton* button, mButtons)
|
||||
{
|
||||
if (mButtonRemoveSignal)
|
||||
{
|
||||
(*mButtonRemoveSignal)(button);
|
||||
}
|
||||
|
||||
delete button;
|
||||
}
|
||||
mButtons.clear();
|
||||
|
|
@ -835,6 +840,11 @@ void LLToolBar::createButtons()
|
|||
mButtons.push_back(button);
|
||||
mButtonPanel->addChild(button);
|
||||
mButtonMap.insert(std::make_pair(command_id.uuid(), button));
|
||||
|
||||
if (mButtonAddSignal)
|
||||
{
|
||||
(*mButtonAddSignal)(button);
|
||||
}
|
||||
}
|
||||
mNeedsLayout = true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue