3 files changed, 111 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 42d8c27..08722a0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1012,5 +1012,14 @@ namespace OpenSim.Region.Environment.Scenes
             return result;
         }
         #endregion
+
+        #region Script Engine
+        private List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface> ScriptEngines = new List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface>();
+        public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine)
+        {
+            ScriptEngines.Add(ScriptEngine);
+            ScriptEngine.InitializeEngine(this);
+        }
+        #endregion
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index bc735c9..3c3b5a7 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 //TODO: WHERE TO PLACE THIS?

-namespace OpenSim.Region.ScriptEngine.DotNetEngine

+namespace OpenSim.Region.Environment.Scenes.Scripting

 {

-    interface ScriptEngineInterface

+    public interface ScriptEngineInterface

     {

         void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld);

         void Shutdown();

diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
new file mode 100644
index 0000000..2f0551c
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -0,0 +1,100 @@
+/*

+* Copyright (c) Contributors, http://www.openmetaverse.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.

+* 

+*/

+/* Original code: Tedd Hansen */

+using System;

+using System.Collections.Generic;

+using System.Text;

+using System.Reflection;

+

+namespace OpenSim.Region.Environment.Scenes.Scripting

+{

+    public class ScriptEngineLoader

+    {

+        public ScriptEngineLoader()

+        {

+        }

+

+        public ScriptEngineInterface LoadScriptEngine(string EngineName)

+        {

+            return LoadAndInitAssembly(@"ScriptEngines\OpenSim.Region.ScriptEngine." + EngineName + ".dll", 

+                        "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");

+        }

+

+        /// <summary>

+        /// Does actual loading and initialization of script Assembly

+        /// </summary>

+        /// <param name="FreeAppDomain">AppDomain to load script into</param>

+        /// <param name="FileName">FileName of script assembly (.dll)</param>

+        /// <returns></returns>

+        private ScriptEngineInterface LoadAndInitAssembly(string FileName, string NameSpace)

+        {

+            //Common.SendToDebug("Loading ScriptEngine Assembly " + FileName);

+            // Load .Net Assembly (.dll)

+            // Initialize and return it

+

+            // TODO: Add error handling

+

+            Assembly a;

+            //try

+            //{

+

+

+            // Load to default appdomain (temporary)

+            a = Assembly.LoadFrom(FileName);

+            // Load to specified appdomain

+            // TODO: Insert security

+            //a = FreeAppDomain.Load(FileName);

+            //}

+            //catch (Exception e)

+            //{

+            //}

+

+

+            //Console.WriteLine("Loading: " + FileName);

+            //foreach (Type _t in a.GetTypes())

+            //{

+            //    Console.WriteLine("Type: " + _t.ToString());

+            //}

+

+            Type t;

+            //try

+            //{

+            t = a.GetType(NameSpace, true);

+            //}

+            //catch (Exception e)

+            //{

+            //}

+

+            return (ScriptEngineInterface)Activator.CreateInstance(t);

+

+

+        }

+

+

+    }

+}