diff options
| author | Richard Linden <none@none> | 2011-09-20 16:37:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-20 16:37:45 -0700 |
| commit | c196013b697102805e8aa160a85f38dccb623851 (patch) | |
| tree | c577700db340312d9415f3c6aff22d0be6983c11 /indra/llui/llbutton.cpp | |
| parent | eb3a643f3bcddb159622e2d38ef65f661b204653 (diff) | |
| parent | 64f30a302dfbcaf56502676fa4b8d8a06f355b40 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 2459429f6e..6c08ec7431 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -314,7 +314,7 @@ boost::signals2::connection LLButton::setHeldDownCallback( const commit_signal_t } -// *TODO: Deprecate (for backwards compatability only) +// *TODO: Deprecate (for backwards compatibility only) boost::signals2::connection LLButton::setClickedCallback( button_callback_t cb, void* data ) { return setClickedCallback(boost::bind(cb, data)); @@ -919,7 +919,7 @@ void LLButton::setToggleState(BOOL b) void LLButton::setFlashing( BOOL b ) { - if (b != mFlashing) + if ((bool)b != mFlashing) { mFlashing = b; mFlashingTimer.reset(); |