OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: Snowcrash <Snowcrash.short@gmail.com> 

Date: Wed, 5 Aug 2009 12:45:56 +0200
Subject: [PATCH] A few minor tweaks to the MRM API's in order to make it possible for MRM's to run in a separate AppDomain without poluting the primary appdomain of OpenSim

Specifically:
Added an explicit method for getting the "globals" of the MRM, removing the need to have the MRM script code loaded into the primary domain, in order to set up proxies
Added a [Serializable] attribute to TouchEventArgs, again in order to remove the need to have MRM script code loaded into the primary domain.

---------

Applied with whitespace changes
arthursv
Melanie 2009-08-07 19:04:20 +01:00
parent 7811bceb8f
commit 3219e648cc
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs
View File

@ -33,5 +33,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
void RegisterExtension<T>(T instance); void RegisterExtension<T>(T instance);
void InitializeMRM(MRMBase mmb, uint localID, UUID itemID); void InitializeMRM(MRMBase mmb, uint localID, UUID itemID);
void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host);
} }
} }

1
OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
View File

@ -32,6 +32,7 @@ using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
[Serializable]
public class TouchEventArgs : EventArgs public class TouchEventArgs : EventArgs
{ {
public IAvatar Avatar; public IAvatar Avatar;

15
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -164,16 +164,23 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
} }
} }
public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host)
{
world = new World(m_scene);
host = new Host(new SOPObject(m_scene, localID), m_scene, new ExtensionHandler(m_extensions), m_microthreads);
}
public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID) public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID)
{ {
m_log.Info("[MRM] Created MRM Instance"); m_log.Info("[MRM] Created MRM Instance");
IWorld m_world = new World(m_scene); IWorld world;
IHost m_host = new Host(new SOPObject(m_scene, localID), m_scene, new ExtensionHandler(m_extensions), IHost host;
m_microthreads);
mmb.InitMiniModule(m_world, m_host, itemID); GetGlobalEnvironment(localID, out world, out host);
mmb.InitMiniModule(world, host, itemID);
} }
public void PostInitialise() public void PostInitialise()