aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-14 01:06:43 +0100
committerJustin Clark-Casey (justincc)2011-10-14 01:06:43 +0100
commitee84c0589ccca1e7f3216ca1395c3002b773f30f (patch)
tree9d702b1de81680c8b3f923c50a6941c94ee367ea
parentExpose minimum frame time and update periods for experimentation. (diff)
downloadopensim-SC_OLD-ee84c0589ccca1e7f3216ca1395c3002b773f30f.zip
opensim-SC_OLD-ee84c0589ccca1e7f3216ca1395c3002b773f30f.tar.gz
opensim-SC_OLD-ee84c0589ccca1e7f3216ca1395c3002b773f30f.tar.bz2
opensim-SC_OLD-ee84c0589ccca1e7f3216ca1395c3002b773f30f.tar.xz
Don't execute rest of code in XEngine.RemoveRegion() and Close() if the module is disabled.
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index f6afcdb..2a0ec37 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -269,6 +269,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
269 269
270 public void RemoveRegion(Scene scene) 270 public void RemoveRegion(Scene scene)
271 { 271 {
272 if (!m_Enabled)
273 return;
274
272 lock (m_Scripts) 275 lock (m_Scripts)
273 { 276 {
274 m_log.InfoFormat( 277 m_log.InfoFormat(
@@ -351,6 +354,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
351 354
352 public void Close() 355 public void Close()
353 { 356 {
357 if (!m_Enabled)
358 return;
359
354 lock (m_ScriptEngines) 360 lock (m_ScriptEngines)
355 { 361 {
356 if (m_ScriptEngines.Contains(this)) 362 if (m_ScriptEngines.Contains(this))