aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-15 18:51:17 +0000
committerMelanie Thielker2009-04-15 18:51:17 +0000
commit3c338e4e563509e480d5eab71134126d1d7aadf5 (patch)
tree8a6c038d859f41a97d857770dc626d38d8a8cd3a /OpenSim/Region/ScriptEngine/DotNetEngine
parent* Resolve unit test failure introduced in r9148 (probably) (diff)
downloadopensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.zip
opensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.tar.gz
opensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.tar.bz2
opensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.tar.xz
Convert both script engines to new region module format. Add proper unload
handling to XEngine. Add needed stubs to DotNetEngine.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 23acc08..f7a9648 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
43namespace OpenSim.Region.ScriptEngine.DotNetEngine 43namespace OpenSim.Region.ScriptEngine.DotNetEngine
44{ 44{
45 [Serializable] 45 [Serializable]
46 public class ScriptEngine : IRegionModule, IScriptEngine, IScriptModule 46 public class ScriptEngine : INonSharedRegionModule, IScriptEngine, IScriptModule
47 { 47 {
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 49
@@ -117,11 +117,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
117 } 117 }
118 } 118 }
119 119
120 public void Initialise(Scene Sceneworld, IConfigSource config) 120 public void Initialise(IConfigSource config)
121 {
122 ConfigSource = config;
123 }
124
125 public void AddRegion(Scene Sceneworld)
121 { 126 {
122 m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing"); 127 m_log.Info("[" + ScriptEngineName + "]: ScriptEngine initializing");
123 128
124 ConfigSource = config;
125 m_Scene = Sceneworld; 129 m_Scene = Sceneworld;
126 130
127 // Make sure we have config 131 // Make sure we have config
@@ -153,7 +157,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
153 m_Scene.StackModuleInterface<IScriptModule>(this); 157 m_Scene.StackModuleInterface<IScriptModule>(this);
154 } 158 }
155 159
156 public void PostInitialise() 160 public void RemoveRegion(Scene scene)
161 {
162 }
163
164 public void RegionLoaded(Scene scene)
157 { 165 {
158 if (!m_enabled) 166 if (!m_enabled)
159 return; 167 return;