diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
| commit | 90f9f5dbad8a0e6dc20b3f7fc58527e572a6b3f7 (patch) | |
| tree | 2b6d67485b851d3c9a7adcad4709fed64b11c428 /indra/llui/llflashtimer.cpp | |
| parent | b43c8afc36a11c34fa76443be85430cac6c72c42 (diff) | |
| parent | 3f6f374c2566c85e1a9480da674bfc2172dd9162 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui/llflashtimer.cpp')
| -rw-r--r-- | indra/llui/llflashtimer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/llflashtimer.cpp b/indra/llui/llflashtimer.cpp index de7a4ab265..e49628acd5 100644 --- a/indra/llui/llflashtimer.cpp +++ b/indra/llui/llflashtimer.cpp @@ -35,6 +35,7 @@ LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period) , mCurrentTickCount(0) , mIsFlashingInProgress(false) , mIsCurrentlyHighlighted(false) + , mUnset(false) { mEventTimer.stop(); @@ -48,6 +49,12 @@ LLFlashTimer::LLFlashTimer(callback_t cb, S32 count, F32 period) } } +void LLFlashTimer::unset() +{ + mUnset = true; + mCallback = NULL; +} + BOOL LLFlashTimer::tick() { mIsCurrentlyHighlighted = !mIsCurrentlyHighlighted; @@ -62,7 +69,7 @@ BOOL LLFlashTimer::tick() stopFlashing(); } - return FALSE; + return mUnset; } void LLFlashTimer::startFlashing() |