aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
diff options
context:
space:
mode:
authorTedd Hansen2008-09-21 01:09:54 +0000
committerTedd Hansen2008-09-21 01:09:54 +0000
commitec494275a2eead0552f2f9819ceedbb4297bd7b5 (patch)
tree88607f93638fa9f1af48dda16402338df83ad89d /OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
parentSome error handling to avoid errors in SEC (diff)
downloadopensim-SC-ec494275a2eead0552f2f9819ceedbb4297bd7b5.zip
opensim-SC-ec494275a2eead0552f2f9819ceedbb4297bd7b5.tar.gz
opensim-SC-ec494275a2eead0552f2f9819ceedbb4297bd7b5.tar.bz2
opensim-SC-ec494275a2eead0552f2f9819ceedbb4297bd7b5.tar.xz
More locks, try's and disable some things in SEC - maybe it won't crash now. :)
Diffstat (limited to 'OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs')
-rw-r--r--OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
index c4f4bbe..0851fc3 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs
@@ -43,13 +43,17 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
43 public RegionScriptEngineBase scriptEngine; 43 public RegionScriptEngineBase scriptEngine;
44 public void Initialise(Scene scene, IConfigSource source) 44 public void Initialise(Scene scene, IConfigSource source)
45 { 45 {
46 return;
46 // New region is being created 47 // New region is being created
47 // Create a new script engine 48 // Create a new script engine
48 try 49 try
49 { 50 {
50 scriptEngine = 51 lock (ComponentRegistry.scriptEngines)
51 Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as 52 {
52 RegionScriptEngineBase; 53 scriptEngine =
54 Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as
55 RegionScriptEngineBase;
56 }
53 scriptEngine.Initialize(scene, source); 57 scriptEngine.Initialize(scene, source);
54 } 58 }
55 catch (Exception ex) 59 catch (Exception ex)