1 files changed, 69 insertions, 39 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs
index 2e91142..ae8d632 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs
@@ -1,47 +1,65 @@
 using System;

 using System.CodeDom.Compiler;

+using System.Collections.Generic;

 using System.IO;

 using System.Reflection;

 using System.Text;

 using log4net;

 using Microsoft.CSharp;

 using Nini.Config;

+using OpenMetaverse;

 using OpenSim.Region.Framework.Interfaces;

 using OpenSim.Region.Framework.Scenes;

 

 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

 {

-    class MiniModule : IRegionModule

+    public class MiniModule : IRegionModule

     {

         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

         private Scene m_scene;

         

+        private readonly Dictionary<UUID,MiniModuleBase> m_scripts = new Dictionary<UUID, MiniModuleBase>();

 

         private static readonly CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();

 

         public void Initialise(Scene scene, IConfigSource source)

         {

-            m_scene = scene;

-            scene.EventManager.OnRezScript += EventManager_OnRezScript;

+            if (source.Configs["MRM"] != null)

+            {

+                if (source.Configs["MRM"].GetBoolean("Enabled", false))

+                {

+                    m_log.Info("[MRM] Enabling MRM Module");

+                    m_scene = scene;

+                    scene.EventManager.OnRezScript += EventManager_OnRezScript;

+                }

+                else

+                {

+                    m_log.Info("[MRM] Disabled MRM Module (Express)");

+                }

+            }

+            else

+            {

+                m_log.Info("[MRM] Disabled MRM Module (Omission)");

+            }

         }

 

-        void EventManager_OnRezScript(uint localID, OpenMetaverse.UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)

+        void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)

         {

-            if(true)

-                return;

-

-            if(engine == "MiniMod")

+            if (script.StartsWith("//MiniMod:C#"))

             {

-                if(script.StartsWith("//MiniMod:C#"))

-                {

-                    IWorld m_world = new World(m_scene);

-                    IHost m_host = new Host(new SOPObject(m_scene, localID));

-

-                    MiniModuleBase mmb = (MiniModuleBase) AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap(

-                                                              CompileFromDotNetText(script, itemID.ToString()),

-                                                              "OpenSim.MiniModule");

-                    mmb.InitMiniModule(m_world, m_host);

-                }

+                m_log.Info("[MRM] Found C# MRM");

+                IWorld m_world = new World(m_scene);

+                IHost m_host = new Host(new SOPObject(m_scene, localID));

+

+                MiniModuleBase mmb = (MiniModuleBase) AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap(

+                                                          CompileFromDotNetText(script, itemID.ToString()),

+                                                          "OpenSim.MiniModule");

+                m_log.Info("[MRM] Created MRM Instance");

+                mmb.InitMiniModule(m_world, m_host);

+                m_scripts[itemID] = mmb;

+

+                m_log.Info("[MRM] Starting MRM");

+                mmb.Start();

             }

         }

 

@@ -52,7 +70,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 

         public void Close()

         {

-            

+            foreach (KeyValuePair<UUID, MiniModuleBase> pair in m_scripts)

+            {

+                pair.Value.Stop();

+            }

         }

 

         public string Name

@@ -78,8 +99,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 

             // Output assembly name

             string OutFile = Path.Combine("MiniModules", Path.Combine(

-                    m_scene.RegionInfo.RegionID.ToString(),

-                    FilePrefix + "_compiled_" + uuid + ".dll"));

+                                                             m_scene.RegionInfo.RegionID.ToString(),

+                                                             FilePrefix + "_compiled_" + uuid + ".dll"));

+

+            // Create Directories for Assemblies

+            if (!Directory.Exists("MiniModules"))

+                Directory.CreateDirectory("MiniModules");

+            string tmp = Path.Combine("MiniModules", m_scene.RegionInfo.RegionID.ToString());

+            if (!Directory.Exists(tmp))

+                Directory.CreateDirectory(tmp);

+

             try

             {

                 File.Delete(OutFile);

@@ -87,26 +116,26 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             catch (IOException e)

             {

                 throw new Exception("Unable to delete old existing " +

-                        "script-file before writing new. Compile aborted: " +

-                        e);

+                                    "script-file before writing new. Compile aborted: " +

+                                    e);

             }

 

             // DEBUG - write source to disk

-                string srcFileName = FilePrefix + "_source_" +

-                        Path.GetFileNameWithoutExtension(OutFile) + ext;

-                try

-                {

-                    File.WriteAllText(Path.Combine(Path.Combine(

-                                                       "MiniModules",

-                                                       m_scene.RegionInfo.RegionID.ToString()),

-                                                   srcFileName), Script);

-                }

-                catch (Exception ex) //NOTLEGIT - Should be just FileIOException

-                {

-                    m_log.Error("[Compiler]: Exception while " +

-                                "trying to write script source to file \"" +

-                                srcFileName + "\": " + ex.ToString());

-                }

+            string srcFileName = FilePrefix + "_source_" +

+                                 Path.GetFileNameWithoutExtension(OutFile) + ext;

+            try

+            {

+                File.WriteAllText(Path.Combine(Path.Combine(

+                                                   "MiniModules",

+                                                   m_scene.RegionInfo.RegionID.ToString()),

+                                               srcFileName), Script);

+            }

+            catch (Exception ex) //NOTLEGIT - Should be just FileIOException

+            {

+                m_log.Error("[Compiler]: Exception while " +

+                            "trying to write script source to file \"" +

+                            srcFileName + "\": " + ex.ToString());

+            }

 

             // Do actual compile

             CompilerParameters parameters = new CompilerParameters();

@@ -120,7 +149,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             // TODO: Add Libraries

             parameters.ReferencedAssemblies.Add(Path.Combine(rootPath,

                                                              "OpenSim.Region.OptionalModules.dll"));

-

+            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath,

+                                                             "log4net.dll"));

 

             parameters.GenerateExecutable = false;

             parameters.OutputAssembly = OutFile;