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.h | |
| parent | 2ee6bcab371a08791bccad3a4fa072c1d60cd6c9 (diff) | |
| parent | 1ce49f764fa00406088f7bcd7623603baedd5fe8 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/llui/llflashtimer.h')
| -rw-r--r-- | indra/llui/llflashtimer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llflashtimer.h b/indra/llui/llflashtimer.h index 5c8860b097..c60f99a8ea 100644 --- a/indra/llui/llflashtimer.h +++ b/indra/llui/llflashtimer.h @@ -52,6 +52,11 @@ public: bool isFlashingInProgress(); bool isCurrentlyHighlighted(); + /* + * Use this instead of deleting this object. + * The next call to tick() will return true and that will destroy this object. + */ + void unset(); private: callback_t mCallback; @@ -62,6 +67,7 @@ private: S32 mCurrentTickCount; bool mIsCurrentlyHighlighted; bool mIsFlashingInProgress; + bool mUnset; }; #endif /* LL_FLASHTIMER_H */ |