summaryrefslogtreecommitdiff
path: root/indra/llui/lltoolbar.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-08-27 16:51:05 -0700
committerdolphin <dolphin@lindenlab.com>2013-08-27 16:51:05 -0700
commitd29268f331380eb89224c5b0168bf89bd0116422 (patch)
tree47973dc2fbe434066e1de0c1695c3033eb76cc80 /indra/llui/lltoolbar.cpp
parenteaf847e60df3c078d15f8991e9448b06ffa83bf7 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rwxr-xr-xindra/llui/lltoolbar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 3d9f5cbbc2..928e82cb8c 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));
}
}