* Applies Mantis #3630 - Adds support for outside MRM initialisation, makes MRMModule compatible with the Visual Studio MRMLoader ( http://forge.opensimulator.org/gf/project/mrmloader/ )

1 files changed, 16 insertions, 5 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 3a6b1b1..e0b6150 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -108,15 +108,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 try
                 {
                     m_log.Info("[MRM] Found C# MRM");
-                    IWorld m_world = new World(m_scene);
-                    IHost m_host = new Host(new SOPObject(m_scene, localID), m_scene, new ExtensionHandler(m_extensions),
-                                            m_microthreads);
 
                     MRMBase mmb = (MRMBase)AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap(
                                                 CompileFromDotNetText(script, itemID.ToString()),
                                                 "OpenSim.MiniModule");
-                    m_log.Info("[MRM] Created MRM Instance");
-                    mmb.InitMiniModule(m_world, m_host, itemID);
+
+                    InitializeMRM(mmb, localID, itemID);
+
                     m_scripts[itemID] = mmb;
 
                     m_log.Info("[MRM] Starting MRM");
@@ -148,6 +146,19 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             }
         }
 
+        public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID)
+        {
+
+            m_log.Info("[MRM] Created MRM Instance");
+
+            IWorld m_world = new World(m_scene);
+            IHost m_host = new Host(new SOPObject(m_scene, localID), m_scene, new ExtensionHandler(m_extensions),
+                                    m_microthreads);
+
+            mmb.InitMiniModule(m_world, m_host, itemID);
+
+        }
+
         public void PostInitialise()
         {