diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptEngine.cs | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptEngine.cs index 5ec77f3..6373d3c 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -27,14 +27,10 @@ | |||
27 | */ | 27 | */ |
28 | /* Original code: Tedd Hansen */ | 28 | /* Original code: Tedd Hansen */ |
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using Nini.Config; |
31 | using System.Text; | ||
32 | using OpenSim.Framework.Console; | 31 | using OpenSim.Framework.Console; |
33 | using OpenSim.Region.Environment.Scenes; | ||
34 | using OpenSim.Region.Environment.Scenes.Scripting; | ||
35 | using OpenSim.Region.Environment.Interfaces; | 32 | using OpenSim.Region.Environment.Interfaces; |
36 | using libsecondlife; | 33 | using OpenSim.Region.Environment.Scenes; |
37 | using Nini.Config; | ||
38 | 34 | ||
39 | namespace OpenSim.Grid.ScriptEngine.DotNetEngine | 35 | namespace OpenSim.Grid.ScriptEngine.DotNetEngine |
40 | { | 36 | { |
@@ -42,17 +38,16 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
42 | /// This is the root object for ScriptEngine | 38 | /// This is the root object for ScriptEngine |
43 | /// </summary> | 39 | /// </summary> |
44 | [Serializable] | 40 | [Serializable] |
45 | public class ScriptEngine :IRegionModule | 41 | public class ScriptEngine : IRegionModule |
46 | { | 42 | { |
47 | 43 | internal Scene World; | |
48 | internal OpenSim.Region.Environment.Scenes.Scene World; | 44 | internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim |
49 | internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim | 45 | internal EventQueueManager m_EventQueueManager; // Executes events |
50 | internal EventQueueManager m_EventQueueManager; // Executes events | 46 | internal ScriptManager m_ScriptManager; // Load, unload and execute scripts |
51 | internal ScriptManager m_ScriptManager; // Load, unload and execute scripts | ||
52 | internal AppDomainManager m_AppDomainManager; | 47 | internal AppDomainManager m_AppDomainManager; |
53 | internal LSLLongCmdHandler m_LSLLongCmdHandler; | 48 | internal LSLLongCmdHandler m_LSLLongCmdHandler; |
54 | 49 | ||
55 | private OpenSim.Framework.Console.LogBase m_log; | 50 | private LogBase m_log; |
56 | 51 | ||
57 | public ScriptEngine() | 52 | public ScriptEngine() |
58 | { | 53 | { |
@@ -65,9 +60,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
65 | get { return m_log; } | 60 | get { return m_log; } |
66 | } | 61 | } |
67 | 62 | ||
68 | public void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger) | 63 | public void InitializeEngine(Scene Sceneworld, LogBase logger) |
69 | { | 64 | { |
70 | |||
71 | World = Sceneworld; | 65 | World = Sceneworld; |
72 | m_log = logger; | 66 | m_log = logger; |
73 | 67 | ||
@@ -84,10 +78,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
84 | 78 | ||
85 | // Should we iterate the region for scripts that needs starting? | 79 | // Should we iterate the region for scripts that needs starting? |
86 | // Or can we assume we are loaded before anything else so we can use proper events? | 80 | // Or can we assume we are loaded before anything else so we can use proper events? |
87 | |||
88 | |||
89 | } | 81 | } |
90 | 82 | ||
91 | public void Shutdown() | 83 | public void Shutdown() |
92 | { | 84 | { |
93 | // We are shutting down | 85 | // We are shutting down |
@@ -106,12 +98,11 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
106 | 98 | ||
107 | public void Initialise(Scene scene, IConfigSource config) | 99 | public void Initialise(Scene scene, IConfigSource config) |
108 | { | 100 | { |
109 | this.InitializeEngine(scene, MainLog.Instance); | 101 | InitializeEngine(scene, MainLog.Instance); |
110 | } | 102 | } |
111 | 103 | ||
112 | public void PostInitialise() | 104 | public void PostInitialise() |
113 | { | 105 | { |
114 | |||
115 | } | 106 | } |
116 | 107 | ||
117 | public void Close() | 108 | public void Close() |
@@ -130,4 +121,4 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
130 | 121 | ||
131 | #endregion | 122 | #endregion |
132 | } | 123 | } |
133 | } | 124 | } \ No newline at end of file |