From 24628928c3bd7148e9df6920ca8b3ed74aaafb49 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 26 Sep 2008 15:01:03 +0000
Subject: Add per-instance date to DNE to avoid serializing stuff 10 times a
 second. Clode cleanup and removal of commented stuff in ScriptManager.

---
 OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs')

diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
index 3b7e88e..eba88f3 100644
--- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
@@ -140,28 +140,23 @@ namespace OpenSim.Region.ScriptEngine.Common
         /// </summary>
         /// <param name="FunctionName">Name of function to execute</param>
         /// <param name="args">Arguments to pass to function</param>
-        public void ExecuteEvent(string FunctionName, object[] args)
+        public void ExecuteEvent(string state, string FunctionName, object[] args)
         {
-            if (m_Running == false)
-            {
-                // Script is inactive, do not execute!
-                return;
-            }
-            DoExecuteEvent(FunctionName, args);
+            DoExecuteEvent(state, FunctionName, args);
         }
 
-        protected abstract void DoExecuteEvent(string FunctionName, object[] args);
+        protected abstract void DoExecuteEvent(string state, string FunctionName, object[] args);
 
         /// <summary>
         ///  Compute the events handled by the current state of the script
         /// </summary>
         /// <returns>state mask</returns>
-        public scriptEvents GetStateEventFlags()
+        public scriptEvents GetStateEventFlags(string state)
         {
-            return DoGetStateEventFlags();
+            return DoGetStateEventFlags(state);
         }
 
-        protected abstract scriptEvents DoGetStateEventFlags();
+        protected abstract scriptEvents DoGetStateEventFlags(string state);
 
         /// <summary>
         /// Stop script from running. Event execution will be ignored.
-- 
cgit v1.1