diff options
| author | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
| commit | fc8c3a4cf7368ad7ee78e817e8c116d09b7377d0 (patch) | |
| tree | 7513b7d0b5651d5de6e1ca4873efdc4689d5245b /indra/llui/lltoolbar.cpp | |
| parent | 5f7f84c7acb686659b2bdc9a018b18c2b23db3d0 (diff) | |
| parent | fb82d0c4dbb6f6e3c58cca6ab69d638bda851b34 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rwxr-xr-x | indra/llui/lltoolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 8d1017c1b4..040930aea5 100755 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -381,7 +381,7 @@ bool LLToolBar::stopCommandInProgress(const LLCommandId& commandId) return (command_button != NULL); } -bool LLToolBar::flashCommand(const LLCommandId& commandId, bool flash) +bool LLToolBar::flashCommand(const LLCommandId& commandId, bool flash, bool force_flashing/* = false */) { LLButton * command_button = NULL; @@ -391,7 +391,7 @@ bool LLToolBar::flashCommand(const LLCommandId& commandId, bool flash) if (it != mButtonMap.end()) { command_button = it->second; - command_button->setFlashing(flash ? TRUE : FALSE); + command_button->setFlashing((BOOL)(flash),(BOOL)(force_flashing)); } } |