aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:50:55 +0100
committerMelanie2011-10-25 01:50:55 +0100
commit69b480770aa93a03d5e7d463e3497859b0a1f593 (patch)
treee8646e991a57183f251f106621e4917e62387834 /OpenSim/Region
parentMerge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge (diff)
parentDon't execute rest of code in XEngine.RemoveRegion() and Close() if the modul... (diff)
downloadopensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.zip
opensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.tar.gz
opensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.tar.bz2
opensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.tar.xz
Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge
Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c437703..32d1fd3 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -337,6 +337,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
337 337
338 public void RemoveRegion(Scene scene) 338 public void RemoveRegion(Scene scene)
339 { 339 {
340 if (!m_Enabled)
341 return;
340 lockScriptsForRead(true); 342 lockScriptsForRead(true);
341 foreach (IScriptInstance instance in m_Scripts.Values) 343 foreach (IScriptInstance instance in m_Scripts.Values)
342 { 344 {
@@ -418,6 +420,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
418 420
419 public void Close() 421 public void Close()
420 { 422 {
423 if (!m_Enabled)
424 return;
425
421 lock (m_ScriptEngines) 426 lock (m_ScriptEngines)
422 { 427 {
423 if (m_ScriptEngines.Contains(this)) 428 if (m_ScriptEngines.Contains(this))