From ec076c97feaa2976520e28fd1c1b23099be656d7 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Fri, 5 Feb 2010 18:15:31 -0800
Subject: EXT-4754 Fix for LLEventTimer::updateClass crash. Ugh. Update on
 Tofu's patch for this bug. Reviewed by Richard

---
 indra/newview/llspeakers.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llspeakers.h')

diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index ddc3632f07..9fa46d0650 100644
--- a/indra/newview/llspeakers.h
+++ b/indra/newview/llspeakers.h
@@ -155,6 +155,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 +187,7 @@ public:
 	 *
 	 * @see onTimerActionCallback()
 	 */
-	void unsetActionTimer(const LLUUID& speaker_id, bool delete_it);
+	void unsetActionTimer(const LLUUID& speaker_id);
 
 	void removeAllTimers();
 private:
@@ -188,7 +195,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()
 	 */
-- 
cgit v1.2.3


From ec0dd8968c7bbfd469d7400920f93c68ba168d5d Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sat, 6 Feb 2010 19:19:07 +0000
Subject: Update the rest of the LLEventTimer users to #include lleventtimer.h.
  I think.

---
 indra/newview/llspeakers.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llspeakers.h')

diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index 9fa46d0650..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"
 
-- 
cgit v1.2.3