7 files changed, 83 insertions, 17 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 51dcb7d..6265683 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface IScriptModule : IRegionModule
+    public interface IScriptModule: INonSharedRegionModule
     {
         string ScriptEngineName { get; }
 
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 23acc08..f7a9648 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 namespace OpenSim.Region.ScriptEngine.DotNetEngine
 {
     [Serializable]
-    public class ScriptEngine : IRegionModule, IScriptEngine, IScriptModule
+    public class ScriptEngine : INonSharedRegionModule, IScriptEngine, IScriptModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -117,11 +117,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             }
         }
 
-        public void Initialise(Scene Sceneworld, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            ConfigSource = config;
+        }
+
+        public void AddRegion(Scene Sceneworld)
         {
             m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing");
 
-            ConfigSource = config;
             m_Scene = Sceneworld;
 
             // Make sure we have config
@@ -153,7 +157,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             m_Scene.StackModuleInterface<IScriptModule>(this);
         }
 
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void RegionLoaded(Scene scene)
         {
             if (!m_enabled)
                 return;
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 017a6ba..44d5cbe 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -104,5 +104,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         string GetAssemblyName();
         string GetXMLState();
         double MinEventDelay { set; }
+        UUID RegionID { get; }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 1c865e8..8e3d026 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -93,6 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private bool m_postOnRez;
         private bool m_startedFromSavedState = false;
         private string m_CurrentState = String.Empty;
+        private UUID m_RegionID = UUID.Zero;
 
         //private ISponsor m_ScriptSponsor;
         private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
@@ -231,6 +232,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             m_MaxScriptQueue = maxScriptQueue;
             m_stateSource = stateSource;
             m_postOnRez = postOnRez;
+            m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
 
             if (part != null)
             {
@@ -980,5 +982,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             return ScriptSerializer.Serialize(this);
         }
+
+        public UUID RegionID
+        {
+            get { return m_RegionID; }
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index cf98cf1..9fe48df 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -60,7 +60,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
 
             XEngine.XEngine engine = new XEngine.XEngine();
-            engine.Initialise(scene, initConfigSource);
+            engine.Initialise(initConfigSource);
+            engine.AddRegion(scene);
 
             m_lslApi = new LSL_Api();
             m_lslApi.Initialize(engine, part, part.LocalId, part.UUID);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index 663b0ca..402fb2f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -60,9 +60,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
         [Test]
         public void T001_XStart()
         {
-            IRegionModule xengine = new XEngine();
+            INonSharedRegionModule xengine = new XEngine();
             SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), xengine);
-            xengine.PostInitialise();
+            xengine.RegionLoaded(scene);
         }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 5317cf1..4b9affc 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -52,14 +52,14 @@ using OpenSim.Region.ScriptEngine.Interfaces;
 
 namespace OpenSim.Region.ScriptEngine.XEngine
 {
-    public class XEngine : IRegionModule, IScriptModule, IScriptEngine
+    public class XEngine : INonSharedRegionModule, IScriptModule, IScriptEngine
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private SmartThreadPool m_ThreadPool;
         private int m_MaxScriptQueue;
         private Scene m_Scene;
-        private IConfig m_ScriptConfig;
+        private IConfig m_ScriptConfig = null;
         private ICompiler m_Compiler;
         private int m_MinThreads;
         private int m_MaxThreads ;
@@ -154,9 +154,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         //
         // IRegionModule functions
         //
-        public void Initialise(Scene scene, IConfigSource configSource)
+        public void Initialise(IConfigSource configSource)
         {
+            if (configSource.Configs["XEngine"] == null)
+                return;
+
             m_ScriptConfig = configSource.Configs["XEngine"];
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_ScriptConfig == null)
+                return;
             m_ScriptFailCount = 0;
             m_ScriptErrorMessage = String.Empty;
 
@@ -237,7 +246,52 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
         }
 
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
+        {
+            lock (m_Scripts)
+            {
+                foreach (IScriptInstance instance in m_Scripts.Values)
+                {
+                    // Force a final state save
+                    //
+                    if (m_Assemblies.ContainsKey(instance.AssetID))
+                    {
+                        string assembly = m_Assemblies[instance.AssetID];
+                        instance.SaveState(assembly);
+                    }
+
+                    // Clear the event queue and abort the instance thread
+                    //
+                    instance.ClearQueue();
+                    instance.Stop(0);
+
+                    // Unload scripts and app domains
+                    // Must be done explicitly because they have infinite
+                    // lifetime
+                    //
+                    m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
+                    if (m_DomainScripts[instance.AppDomain].Count == 0)
+                    {
+                        m_DomainScripts.Remove(instance.AppDomain);
+                        UnloadAppDomain(instance.AppDomain);
+                    }
+
+                    // Release events, timer, etc
+                    //
+                    instance.DestroyScriptInstance();
+                }
+                m_Scripts.Clear();
+                m_PrimObjects.Clear();
+                m_Assemblies.Clear();
+                m_DomainScripts.Clear();
+            }
+            lock (m_ScriptEngines)
+            {
+                m_ScriptEngines.Remove(this);
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
         {
             if (!m_Enabled)
                 return;
@@ -346,11 +400,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             get { return "XEngine"; }
         }
 
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
-
         public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)
         {
             if (script.StartsWith("//MRM:"))