* 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, 25 insertions, 41 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Eventstream.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index dab7a0a..2fa67a4 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Eventstream.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -25,51 +25,35 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using log4net;
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
+using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.Environment.Scenes;
+using libsecondlife;
+using Nini.Config;
+using OpenSim.Region.ScriptEngine.Interfaces;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins
+namespace OpenSim.Region.ScriptEngine.Interfaces
 {
-    public class Eventstream
+    public interface IScriptEngine
     {
-        public AsyncCommandManager m_CmdManager;
-
-        private class Event
-        {
-            public uint LocalID;
-            public string EventName;
-            public Dictionary<LLUUID, XDetectParams> DetectParams;
-        }
-
-        private Dictionary<uint, Dictionary<string, Event> > m_Events =
-                new Dictionary<uint, Dictionary<string, Event> >();
-
-        public Eventstream(AsyncCommandManager CmdManager)
-        {
-            m_CmdManager = CmdManager;
-        }
-
-        public void AddObjectEvent(uint localID, string eventName, XDetectParams det)
-        {
-            SceneObjectPart part = m_CmdManager.m_ScriptEngine.World.
-                GetSceneObjectPart(localID);
-
-            if (part == null) // Can't register events for non-prims
-                return;
-
-            if (!part.ContainsScripts())
-                return;
-        }
-
-        public void RemoveObjectEvent(uint localID, string eventName, LLUUID id)
-        {
-        }
-
-        public void RemoveObjects(uint localID)
-        {
-        }
+        //
+        // An interface for a script API module to communicate with
+        // the engine it's running under
+        //
+
+        Scene World { get; }
+        IConfig Config { get; }
+        Object AsyncCommands { get; }
+        ILog Log { get; }
+
+        bool PostScriptEvent(LLUUID itemID, EventParams parms);
+        bool PostObjectEvent(uint localID, EventParams parms);
+        void ResetScript(LLUUID itemID);
+        void SetScriptState(LLUUID itemID, bool state);
+        bool GetScriptState(LLUUID itemID);
+        void SetState(LLUUID itemID, string newState);
+
+        DetectParams GetDetectParams(LLUUID item, int number);
     }
 }