summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-25 15:52:08 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-25 15:52:08 -0700
commita5f3c70eeff4aeeb3c5fd463bed5be7cfb2cf60e (patch)
tree9de8c95d788a5a55c20aa3973f361abb20aaacca /indra/llui
parent8448e3b86e9ed94a29a6d1e0bdc8b8f78ff84091 (diff)
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.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lltoolbar.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index ea11750e38..2d96bf2fc6 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -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;
}