diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-04 14:45:19 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-04 14:45:19 +0200 |
| commit | 4c3510bc4e4c2365bf75c3fbfdfae6b329a420e0 (patch) | |
| tree | 6a712f7b27366afc5e99e1b43138be45edeef388 /indra/llui/llflashtimer.cpp | |
| parent | f888a3fd00ca32275ab2da6437cb011b3ab78f89 (diff) | |
| parent | 8c24cc8e3635888b766e30001749966eddc0dc7e (diff) | |
merging
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() |