From c80bc0e259ddf4afe6e8811684ffb505edf6d2a8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 29 Jul 2010 21:01:21 -0500
Subject: Added a timer after ignoring LightShare settings.

If you ignore a LightShare setting, all settings for the next
30 seconds will be ignored. The timer resets each time a new
message is ignored. Customize with LightShareIgnoreTimer
in Debug Settings.
---
 linden/indra/newview/lightshare.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'linden/indra/newview/lightshare.h')

diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index cbc03ad..5b24ae3 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -31,6 +31,7 @@
 
 #include "message.h"
 #include "meta7windlight.h"
+#include "lltimer.h"
 #include "llwaterparamset.h"
 #include "llwlparamset.h"
 
@@ -54,9 +55,15 @@ class WindlightMessage
 	bool apply();
 	bool isValid();
 
+	protected:
+
+	static void resetIgnoreTimer();
+	static bool ignoreTimerHasExpired();
+
 	private:
 
 	static WindlightMessage* sMostRecent;
+	static LLTimer* sIgnoreTimer;
 
 	Meta7WindlightPacket* mPacket;
 	LLWaterParamSet* mWater;
-- 
cgit v1.1