From 65990de3905a4b117e5fef2c535fcc9d920be6c5 Mon Sep 17 00:00:00 2001
From: Adam Frisby <adam@gwala.net>
Date: Thu, 5 Mar 2009 00:52:59 +0000
Subject: [PATCH] MRM Scripting Changes * Renames MiniRegionModule to MRMModule
 to make it more distinct from the actual Mini Region Module[s] executed in
 Scene. * Renames MiniRegionModuleBase to MRMBase for convenience. MRM's need
 to be adjusted to inherit from MRMBase.

---
 .../Minimodule/{MiniModuleBase.cs => MRMBase.cs}       |  2 +-
 .../Minimodule/{MiniModule.cs => MRMModule.cs}         | 10 +++++-----
 .../OptionalModules/Scripting/Minimodule/SOPObject.cs  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename OpenSim/Region/OptionalModules/Scripting/Minimodule/{MiniModuleBase.cs => MRMBase.cs} (88%)
 rename OpenSim/Region/OptionalModules/Scripting/Minimodule/{MiniModule.cs => MRMModule.cs} (92%)

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModuleBase.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMBase.cs
similarity index 88%
rename from OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModuleBase.cs
rename to OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMBase.cs
index 9ce4506b63..b2e6d2e30d 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModuleBase.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMBase.cs
@@ -1,6 +1,6 @@
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    public abstract class MiniModuleBase
+    public abstract class MRMBase
     {
         private IWorld m_world;
         private IHost m_host;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
similarity index 92%
rename from OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs
rename to OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index ae8d6324cc..86a3240328 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -13,12 +13,12 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    public class MiniModule : IRegionModule
+    public class MRMModule : 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 readonly Dictionary<UUID,MRMBase> m_scripts = new Dictionary<UUID, MRMBase>();
 
         private static readonly CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
 
@@ -51,7 +51,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 IWorld m_world = new World(m_scene);
                 IHost m_host = new Host(new SOPObject(m_scene, localID));
 
-                MiniModuleBase mmb = (MiniModuleBase) AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap(
+                MRMBase mmb = (MRMBase) AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap(
                                                           CompileFromDotNetText(script, itemID.ToString()),
                                                           "OpenSim.MiniModule");
                 m_log.Info("[MRM] Created MRM Instance");
@@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         public void Close()
         {
-            foreach (KeyValuePair<UUID, MiniModuleBase> pair in m_scripts)
+            foreach (KeyValuePair<UUID, MRMBase> pair in m_scripts)
             {
                 pair.Value.Stop();
             }
@@ -78,7 +78,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         public string Name
         {
-            get { return "MiniScriptModule"; }
+            get { return "MiniRegionModule"; }
         }
 
         public bool IsSharedModule
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index cf59cba3de..d939e8522d 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -86,8 +86,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         public Vector3 Scale
         {
-            get { throw new System.NotImplementedException(); }
-            set { throw new System.NotImplementedException(); }
+            get { return GetSOP().Scale; }
+            set { GetSOP().Scale = value; }
         }
 
         public Quaternion Rotation