4 files changed, 90 insertions, 53 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/IScript.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index e5d0b33..efb05d3 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Script/IScript.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -25,22 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Reflection;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using OpenSim.Region.Environment.Interfaces;
+using Nini.Config;
 
-namespace OpenSim.Region.ScriptEngine.XEngine.Script
+namespace OpenSim.Region.ScriptEngine.Interfaces
 {
-    public interface IScript
+    public interface ICompiler
     {
-        Type Start(ILSL_ScriptCommands lsl, IOSSL_ScriptCommands ossl);
-
-        Dictionary<string, object> GetVars();
-        void SetVars(Dictionary<string, object> vars);
-        void ResetVars();
-
-        string State { get; set; }
+        void Configure(IConfig configSource);
+        void Compile(string text, string outFile, List<IScriptApi> apiList);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs
new file mode 100644
index 0000000..553d56d
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using OpenSim.Region.ScriptEngine.Interfaces;
+
+namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
+{
+    public interface IScript
+    {
+        string[] GetApis();
+        void InitApi(string name, IScriptApi data);
+
+        Dictionary<string,Object> GetVars();
+        void SetVars(Dictionary<string,Object> vars);
+        void ResetVars();
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
new file mode 100644
index 0000000..2df41d0
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using libsecondlife;
+using OpenSim.Region.Environment.Scenes;
+
+
+namespace OpenSim.Region.ScriptEngine.Interfaces
+{
+    public interface IScriptApi
+    {
+        //
+        // Each API has an identifier, which is used to load the
+        // proper runtime assembly at load time.
+        //
+        void Initialize(IScriptEngine engine, SceneObjectPart part, uint localID, LLUUID item);
+    }
+}
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);
     }
 }