Skip to content
Snippets Groups Projects
Commit a5f3c70e authored by Leslie Linden's avatar Leslie Linden
Browse files

EXP-1469 FIX -- Changing toolbar from "icons only" to "icons with text" while...

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.
parent 8448e3b8
No related branches found
No related tags found
No related merge requests found
...@@ -824,6 +824,11 @@ void LLToolBar::createButtons() ...@@ -824,6 +824,11 @@ void LLToolBar::createButtons()
{ {
BOOST_FOREACH(LLToolBarButton* button, mButtons) BOOST_FOREACH(LLToolBarButton* button, mButtons)
{ {
if (mButtonRemoveSignal)
{
(*mButtonRemoveSignal)(button);
}
delete button; delete button;
} }
mButtons.clear(); mButtons.clear();
...@@ -835,6 +840,11 @@ void LLToolBar::createButtons() ...@@ -835,6 +840,11 @@ void LLToolBar::createButtons()
mButtons.push_back(button); mButtons.push_back(button);
mButtonPanel->addChild(button); mButtonPanel->addChild(button);
mButtonMap.insert(std::make_pair(command_id.uuid(), button)); mButtonMap.insert(std::make_pair(command_id.uuid(), button));
if (mButtonAddSignal)
{
(*mButtonAddSignal)(button);
}
} }
mNeedsLayout = true; mNeedsLayout = true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment