summaryrefslogtreecommitdiff
path: root/indra/llui/llflashtimer.h
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-03 19:20:11 +0200
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-03 19:20:11 +0200
commit1ce49f764fa00406088f7bcd7623603baedd5fe8 (patch)
treeb8476f9270668c04f604bde673db7016caf3b25e /indra/llui/llflashtimer.h
parentd48357f54765f84a35b73bbf28e88b978bcb5013 (diff)
CHUI-532 FIXED (Viewer crash when user in conversation is removed from participant list because they logged out or teleported away)
delayed destroy of the timer
Diffstat (limited to 'indra/llui/llflashtimer.h')
-rw-r--r--indra/llui/llflashtimer.h6
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 */