EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

1 files changed, 3 insertions, 2 deletions

diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index 575bf9fc0b..6f67e19c48 100644
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -122,11 +122,12 @@ void secondsToTimecodeString(F32 current_time, char *tcstring);
 class LLEventTimer 
 {
 public:
-	LLEventTimer(F32 period);	// period is the amount of time between each call to tick()
+	LLEventTimer(F32 period);	// period is the amount of time between each call to tick() in seconds
 	virtual ~LLEventTimer();
 
 	//function to be called at the supplied frequency
-	virtual void tick() = 0;
+	// Normally return FALSE; TRUE will delete the timer after the function returns.
+	virtual BOOL tick() = 0;
 
 	static void updateClass();