svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/lscript/lscript_execute.h b/indra/lscript/lscript_execute.h
index b1b866570c..a22c37cfe9 100644
--- a/indra/lscript/lscript_execute.h
+++ b/indra/lscript/lscript_execute.h
@@ -452,9 +452,16 @@ public:
 	// Called when the script is scheduled to be stopped from newsim/LLScriptData
 	virtual void stopRunning() = 0;
 	
+	// A timer is regularly checked to see if script takes too long, but we
+	// don't do it every opcode due to performance hits.
+	static void		setTimerCheckSkip( S32 value )			{ sTimerCheckSkip = value;		}
+	static S32		getTimerCheckSkip()						{ return sTimerCheckSkip;		}
+
 private:
 
 	BOOL mReset;
+
+	static	S32		sTimerCheckSkip;		// Number of times to skip the timer check for performance reasons
 };
 
 class LLScriptExecuteLSL2 : public LLScriptExecute