diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-03 17:01:53 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-03 17:01:53 -0800 |
| commit | ad7cb33bbc4f3dae5ad8396b11e98d2e1490e349 (patch) | |
| tree | b3eca812c6f582332a107ccb28c1b4a94df8d3cf /indra/llui/llflashtimer.cpp | |
| parent | 2ee6bcab371a08791bccad3a4fa072c1d60cd6c9 (diff) | |
| parent | 1ce49f764fa00406088f7bcd7623603baedd5fe8 (diff) | |
merging in latest changes
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() |