6 files changed, 75 insertions, 6 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
new file mode 100644
index 0000000..4de249f
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs
@@ -0,0 +1,48 @@
+using System.Drawing;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Scenes;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    class Graphics : IGraphics

+    {

+        private readonly Scene m_scene;

+

+        public Graphics(Scene m_scene)

+        {

+            this.m_scene = m_scene;

+        }

+

+        public UUID SaveBitmap(Bitmap data)

+        {

+            return SaveBitmap(data, false, true);

+        }

+

+        public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary)

+        {

+            AssetBase asset = new AssetBase();

+            asset.FullID = UUID.Random();

+            asset.Data = OpenJPEG.EncodeFromImage(data, lossless);

+            asset.Name = "MRMDynamicImage" + Util.RandomClass.Next(1, 10000);

+            asset.Type = 0;

+            asset.Description = "MRM Image";

+            asset.Local = false;

+            asset.Temporary = temporary;

+            m_scene.CommsManager.AssetCache.AddAsset(asset);

+

+            return asset.FullID;

+        }

+

+        public Bitmap LoadBitmap(UUID assetID)

+        {

+            AssetBase bmp = m_scene.CommsManager.AssetCache.GetAsset(assetID, true);

+            ManagedImage outimg;

+            Image img;

+            OpenJPEG.DecodeToImage(bmp.Data, out outimg, out img);

+

+            return new Bitmap(img);

+        }

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Host.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Host.cs
index 394e024..f5953d0 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Host.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Host.cs
@@ -27,6 +27,7 @@
 
 using System.Reflection;
 using log4net;
+using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
@@ -34,10 +35,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
     {
         private readonly IObject m_obj;
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly IGraphics m_graphics;
+        private Scene m_scene;
 
-        public Host(IObject m_obj)
+        public Host(IObject m_obj, Scene m_scene)
         {
             this.m_obj = m_obj;
+            this.m_scene = m_scene;
+
+            m_graphics = new Graphics(m_scene);
         }
 
         public IObject Object
@@ -49,5 +55,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         {
             get { return m_log; }
         }
+
+        public IGraphics Graphics
+        {
+            get { return m_graphics; }
+        }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs
new file mode 100644
index 0000000..f4bc12e
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IGraphics.cs
@@ -0,0 +1,12 @@
+using System.Drawing;

+using OpenMetaverse;

+

+namespace OpenSim.Region.OptionalModules.Scripting.Minimodule

+{

+    public interface IGraphics

+    {

+        UUID SaveBitmap(Bitmap data);

+        UUID SaveBitmap(Bitmap data, bool lossless, bool temporary);

+        Bitmap LoadBitmap(UUID assetID);

+    }

+}

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs
index deb7c57..6c76919 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IHost.cs
@@ -36,5 +36,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
     {
         IObject Object { get; }
         ILog Console { get; }
+        IGraphics Graphics { get; }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 910ddea..b978d7c 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 {
                     m_log.Info("[MRM] Found C# MRM");
                     IWorld m_world = new World(m_scene);
-                    IHost m_host = new Host(new SOPObject(m_scene, localID));
+                    IHost m_host = new Host(new SOPObject(m_scene, localID), m_scene);
 
                     MRMBase mmb = (MRMBase)AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap(
                                                 CompileFromDotNetText(script, itemID.ToString()),
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index 2280022..f2b3e81 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -26,10 +26,7 @@
  */
 
 using System.Collections.Generic;
-using System.Reflection;
-using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -159,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             // Skip if other
         }
 
-        void EventManager_OnChatFromClient(object sender, OpenSim.Framework.OSChatMessage chat)
+        void EventManager_OnChatFromClient(object sender, OSChatMessage chat)
         {
             if (_OnChat != null)
             {