diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 16:01:54 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 16:01:54 -0800 |
| commit | f23e0ffdb2ff2ad43a996c489b08c1324d9e5ee1 (patch) | |
| tree | e5219901b9edc82f78a530219707f5859ccb54fc /indra/llui/lltoolbar.cpp | |
| parent | b76123589381a2f59b704e8850792f9dcdc62517 (diff) | |
| parent | edeeed95416be2679e1ad3d29bab5396dbcccaa2 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/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); |