aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 46d674d..98e77c0 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
277 // Clear the event queue and abort the instance thread 277 // Clear the event queue and abort the instance thread
278 // 278 //
279 instance.ClearQueue(); 279 instance.ClearQueue();
280 bool stopped = instance.Stop(0); 280 instance.Stop(0);
281 281
282 // Release events, timer, etc 282 // Release events, timer, etc
283 // 283 //
@@ -287,8 +287,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
287 // Must be done explicitly because they have infinite 287 // Must be done explicitly because they have infinite
288 // lifetime 288 // lifetime
289 // 289 //
290 if (stopped) 290 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
291 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
292 if (m_DomainScripts[instance.AppDomain].Count == 0) 291 if (m_DomainScripts[instance.AppDomain].Count == 0)
293 { 292 {
294 m_DomainScripts.Remove(instance.AppDomain); 293 m_DomainScripts.Remove(instance.AppDomain);
@@ -805,7 +804,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
805 m_Scripts.Remove(itemID); 804 m_Scripts.Remove(itemID);
806 805
807 instance.ClearQueue(); 806 instance.ClearQueue();
808 bool stopped = instance.Stop(0); 807 instance.Stop(0);
809 808
810// bool objectRemoved = false; 809// bool objectRemoved = false;
811 810
@@ -830,8 +829,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
830 instance.RemoveState(); 829 instance.RemoveState();
831 instance.DestroyScriptInstance(); 830 instance.DestroyScriptInstance();
832 831
833 if (stopped) 832 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
834 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
835 if (m_DomainScripts[instance.AppDomain].Count == 0) 833 if (m_DomainScripts[instance.AppDomain].Count == 0)
836 { 834 {
837 m_DomainScripts.Remove(instance.AppDomain); 835 m_DomainScripts.Remove(instance.AppDomain);