Converted the LSL scripting engine into a IRegionModule, so now all "modules" share a common base interface and are loaded from the single loader. (It seems to work fine, but I have left the old scriptengine loader, incase we have to change back).

Removed the reference to OpenJpeg in the DynamicTextureModule, to see if that was causing the build problem someone is having. 
Added a Temporary fix for the "existing connection was forcibly closed by the remote host" exception on windows when a user logs out of a multiregion instance. 
Some early work to prepare for improving the way clients are updated (about prims etc).

1 files changed, 31 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index d0823d0..694059c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -30,8 +30,9 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using OpenSim.Framework.Console;

-//using OpenSim.Region.Environment.Scenes;

+using OpenSim.Region.Environment.Scenes;

 using OpenSim.Region.Environment.Scenes.Scripting;

+using OpenSim.Region.Environment.Interfaces;

 using libsecondlife;

 

 namespace OpenSim.Region.ScriptEngine.DotNetEngine

@@ -40,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
     /// This is the root object for ScriptEngine

     /// </summary>

     [Serializable]

-    public class ScriptEngine : OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface

+    public class ScriptEngine :IRegionModule

     {

 

         internal OpenSim.Region.Environment.Scenes.Scene World;

@@ -99,5 +100,33 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         //    Log.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID);

         //    myScriptManager.StartScript(ScriptID, ObjectID);

         //}

+

+        #region IRegionModule

+

+        public void Initialise(Scene scene)

+        {

+            this.InitializeEngine(scene, MainLog.Instance);

+        }

+

+        public void PostInitialise()

+        {

+

+        }

+

+        public void CloseDown()

+        {

+        }

+

+        public string GetName()

+        {

+            return "LSLScriptingModule";

+        }

+

+        public bool IsSharedModule()

+        {

+            return false;

+        }

+

+        #endregion

     }

 }