diff options
author | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
commit | 9f8959d480d1069f554c576a4cc9a494559ef1e4 (patch) | |
tree | 7ae4f550c1039cdb15d0087a0511310dddf8b5a5 /indra/llui/lltoolbar.cpp | |
parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
parent | 573ab07a40acc78e28ae390331d862d3f858bb07 (diff) |
Pull merge from viewer-chui
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rw-r--r-- | indra/llui/lltoolbar.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 81ea0ebf0c..1aa46806c3 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -914,6 +914,7 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id) button_p.label = LLTrans::getString(commandp->labelRef()); button_p.tool_tip = LLTrans::getString(commandp->tooltipRef()); button_p.image_overlay = LLUI::getUIImage(commandp->icon()); + button_p.button_flash_enable = commandp->isFlashingAllowed(); button_p.overwriteFrom(mButtonParams[mButtonType]); LLToolBarButton* button = LLUICtrlFactory::create<LLToolBarButton>(button_p); |