aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2009-03-05 00:52:59 +0000
committerAdam Frisby2009-03-05 00:52:59 +0000
commit65990de3905a4b117e5fef2c535fcc9d920be6c5 (patch)
treeadd357af0808eacceba0a389200836ec456850ae /OpenSim
parent* Implements a number of members on SOGObject for use with the MRM Script Eng... (diff)
downloadopensim-SC_OLD-65990de3905a4b117e5fef2c535fcc9d920be6c5.zip
opensim-SC_OLD-65990de3905a4b117e5fef2c535fcc9d920be6c5.tar.gz
opensim-SC_OLD-65990de3905a4b117e5fef2c535fcc9d920be6c5.tar.bz2
opensim-SC_OLD-65990de3905a4b117e5fef2c535fcc9d920be6c5.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMBase.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModuleBase.cs)2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs (renamed from OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs)10
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs4
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModuleBase.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMBase.cs
index 9ce4506..b2e6d2e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModuleBase.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMBase.cs
@@ -1,6 +1,6 @@
1namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 1namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
2{ 2{
3 public abstract class MiniModuleBase 3 public abstract class MRMBase
4 { 4 {
5 private IWorld m_world; 5 private IWorld m_world;
6 private IHost m_host; 6 private IHost m_host;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MiniModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index ae8d632..86a3240 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;
13 13
14namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 14namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
15{ 15{
16 public class MiniModule : IRegionModule 16 public class MRMModule : IRegionModule
17 { 17 {
18 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 18 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
19 private Scene m_scene; 19 private Scene m_scene;
20 20
21 private readonly Dictionary<UUID,MiniModuleBase> m_scripts = new Dictionary<UUID, MiniModuleBase>(); 21 private readonly Dictionary<UUID,MRMBase> m_scripts = new Dictionary<UUID, MRMBase>();
22 22
23 private static readonly CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); 23 private static readonly CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
24 24
@@ -51,7 +51,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
51 IWorld m_world = new World(m_scene); 51 IWorld m_world = new World(m_scene);
52 IHost m_host = new Host(new SOPObject(m_scene, localID)); 52 IHost m_host = new Host(new SOPObject(m_scene, localID));
53 53
54 MiniModuleBase mmb = (MiniModuleBase) AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap( 54 MRMBase mmb = (MRMBase) AppDomain.CurrentDomain.CreateInstanceFromAndUnwrap(
55 CompileFromDotNetText(script, itemID.ToString()), 55 CompileFromDotNetText(script, itemID.ToString()),
56 "OpenSim.MiniModule"); 56 "OpenSim.MiniModule");
57 m_log.Info("[MRM] Created MRM Instance"); 57 m_log.Info("[MRM] Created MRM Instance");
@@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
70 70
71 public void Close() 71 public void Close()
72 { 72 {
73 foreach (KeyValuePair<UUID, MiniModuleBase> pair in m_scripts) 73 foreach (KeyValuePair<UUID, MRMBase> pair in m_scripts)
74 { 74 {
75 pair.Value.Stop(); 75 pair.Value.Stop();
76 } 76 }
@@ -78,7 +78,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
78 78
79 public string Name 79 public string Name
80 { 80 {
81 get { return "MiniScriptModule"; } 81 get { return "MiniRegionModule"; }
82 } 82 }
83 83
84 public bool IsSharedModule 84 public bool IsSharedModule
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index cf59cba..d939e85 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
86 86
87 public Vector3 Scale 87 public Vector3 Scale
88 { 88 {
89 get { throw new System.NotImplementedException(); } 89 get { return GetSOP().Scale; }
90 set { throw new System.NotImplementedException(); } 90 set { GetSOP().Scale = value; }
91 } 91 }
92 92
93 public Quaternion Rotation 93 public Quaternion Rotation