aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorTedd Hansen2008-01-09 17:13:02 +0000
committerTedd Hansen2008-01-09 17:13:02 +0000
commit260145a7e62d9d30bd74ee21288d36c95c8b0443 (patch)
tree7bdaa66ceffe71129968f506e2ab7af04eacc9d6 /OpenSim/Region/ScriptEngine
parentPrim inventory script saving phase 2. (diff)
downloadopensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.zip
opensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.tar.gz
opensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.tar.bz2
opensim-SC_OLD-260145a7e62d9d30bd74ee21288d36c95c8b0443.tar.xz
Dynamic loading of ScriptEngine in ScriptServer
ScriptServer event pipe (OpenSim->ScriptServer->ScriptEngine) should in theory be done
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs8
2 files changed, 11 insertions, 1 deletions
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
47 { 47 {
48 RemoteEvents Events(); 48 RemoteEvents Events();
49 } 49 }
50 public interface ScriptEngine
51 {
52 RemoteEvents EventManager();
53 }
50 54
51 } 55 }
52} 56}
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;
31using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34using OpenSim.Region.ScriptEngine.Common;
34 35
35namespace OpenSim.Region.ScriptEngine.DotNetEngine 36namespace OpenSim.Region.ScriptEngine.DotNetEngine
36{ 37{
@@ -39,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
39 /// </summary> 40 /// </summary>
40 /// 41 ///
41 [Serializable] 42 [Serializable]
42 public class ScriptEngine : IRegionModule 43 public class ScriptEngine : IRegionModule, OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.ScriptEngine
43 { 44 {
44 public Scene World; 45 public Scene World;
45 public EventManager m_EventManager; // Handles and queues incoming events from OpenSim 46 public EventManager m_EventManager; // Handles and queues incoming events from OpenSim
@@ -86,6 +87,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
86 // We are shutting down 87 // We are shutting down
87 } 88 }
88 89
90 ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ScriptEngine.EventManager()
91 {
92 return this.m_EventManager;
93 }
89 94
90 95
91 #region IRegionModule 96 #region IRegionModule
@@ -114,5 +119,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
114 } 119 }
115 120
116 #endregion 121 #endregion
122
117 } 123 }
118} \ No newline at end of file 124} \ No newline at end of file