From 260145a7e62d9d30bd74ee21288d36c95c8b0443 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Wed, 9 Jan 2008 17:13:02 +0000 Subject: Dynamic loading of ScriptEngine in ScriptServer ScriptServer event pipe (OpenSim->ScriptServer->ScriptEngine) should in theory be done --- OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs | 4 ++++ OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs index 6ac7c65..14b97b8 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs @@ -47,6 +47,10 @@ namespace OpenSim.Region.ScriptEngine.Common { RemoteEvents Events(); } + public interface ScriptEngine + { + RemoteEvents EventManager(); + } } } diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 11419be..604a5f3 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs @@ -31,6 +31,7 @@ using Nini.Config; using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.ScriptEngine.Common; namespace OpenSim.Region.ScriptEngine.DotNetEngine { @@ -39,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine /// /// [Serializable] - public class ScriptEngine : IRegionModule + public class ScriptEngine : IRegionModule, OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.ScriptEngine { public Scene World; public EventManager m_EventManager; // Handles and queues incoming events from OpenSim @@ -86,6 +87,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine // We are shutting down } + ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ScriptEngine.EventManager() + { + return this.m_EventManager; + } #region IRegionModule @@ -114,5 +119,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine } #endregion + } } \ No newline at end of file -- cgit v1.1