diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-08 09:50:04 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-08 09:50:04 -0500 |
commit | 5dda2516ad599d3c295930fb3fc0c6cdbe8c2ce5 (patch) | |
tree | 06d761559a50b8df3db4dffa32c6ad28ce398c11 /indra/newview/llspeakers.h | |
parent | f5b82a377256d5806ec101e8a9d90533ea1a3bf9 (diff) | |
parent | bb977a194f42cafdcf3f1245adf3b7f49857e552 (diff) |
merge
Diffstat (limited to 'indra/newview/llspeakers.h')
-rw-r--r-- | indra/newview/llspeakers.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h index ddc3632f07..b924fb2f2c 100644 --- a/indra/newview/llspeakers.h +++ b/indra/newview/llspeakers.h @@ -34,6 +34,7 @@ #define LL_LLSPEAKERS_H #include "llevent.h" +#include "lleventtimer.h" #include "llspeakers.h" #include "llvoicechannel.h" @@ -155,6 +156,13 @@ public: */ virtual BOOL tick(); + /** + * Clears the callback. + * + * Use this instead of deleteing this object. + * The next call to tick() will return true and that will destroy this object. + */ + void unset(); private: action_callback_t mActionCallback; LLUUID mSpeakerId; @@ -180,7 +188,7 @@ public: * * @see onTimerActionCallback() */ - void unsetActionTimer(const LLUUID& speaker_id, bool delete_it); + void unsetActionTimer(const LLUUID& speaker_id); void removeAllTimers(); private: @@ -188,7 +196,6 @@ private: * Callback of the each instance of LLSpeakerActionTimer. * * Unsets an appropriate timer instance and calls action callback for specified speacker_id. - * It always returns false to not use LLEventTimer::updateClass functionality of timer deleting. * * @see unsetActionTimer() */ |