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.h | |
| parent | b43c8afc36a11c34fa76443be85430cac6c72c42 (diff) | |
| parent | 3f6f374c2566c85e1a9480da674bfc2172dd9162 (diff) | |
Pull merge from richard/viewer-chui
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 */ |