diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
| commit | 05e15ccb82541494bf7145652140de187d838cda (patch) | |
| tree | 59e7772de3cd038bf1e1e222abbb7f0cdf315331 /indra/newview/llspeakers.h | |
| parent | 1805369b58d98677c726bb0bcb52618bd66e8fdd (diff) | |
| parent | 56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff) | |
merge from viewer2.
Diffstat (limited to 'indra/newview/llspeakers.h')
| -rw-r--r-- | indra/newview/llspeakers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h index 63237204c8..ddc3632f07 100644 --- a/indra/newview/llspeakers.h +++ b/indra/newview/llspeakers.h @@ -176,11 +176,11 @@ public: void setActionTimer(const LLUUID& speaker_id); /** - * Removes stored LLSpeakerActionTimer for passed speaker UUID from internal map and deletes it. + * Removes stored LLSpeakerActionTimer for passed speaker UUID from internal map and optionally deletes it. * * @see onTimerActionCallback() */ - void unsetActionTimer(const LLUUID& speaker_id); + void unsetActionTimer(const LLUUID& speaker_id, bool delete_it); void removeAllTimers(); private: |