* Applied patch from Melanie, mantis issue #1581 - "Refactor LSL language, api and compiler out of XEngine"

"First stage in a major Script Engine refactor, that will result in the LSL implementaions ebing reconverged. Not there yet, but one major part is done."
Thank you, Melanie!

1 files changed, 9 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs
index 3775372..799005c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs
@@ -28,7 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.Remoting.Lifetime;
-using OpenSim.Region.ScriptEngine.XEngine.Script;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Region.ScriptEngine.Interfaces;
 
 namespace OpenSim.Region.ScriptEngine.XEngine
 {
@@ -117,23 +119,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         /// </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)
         {
-            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);
 
         protected void initEventFlags()
         {