From 82d0d1c092d309ab5c498e279155fc1ceb5738c8 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 2 Jun 2010 21:02:53 +0100
Subject: Revert "Next OSG test. Don't remove app domains if they contain
 running threads."

This reverts commit f831a1778baa766b4810e352f3ae2ab6736e4620.

With this, post-fixes is back to normal.
---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')

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
                     // Clear the event queue and abort the instance thread
                     //
                     instance.ClearQueue();
-                    bool stopped = instance.Stop(0);
+                    instance.Stop(0);
 
                     // Release events, timer, etc
                     //
@@ -287,8 +287,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     // Must be done explicitly because they have infinite
                     // lifetime
                     //
-                    if (stopped)
-                        m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
+                    m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
                     if (m_DomainScripts[instance.AppDomain].Count == 0)
                     {
                         m_DomainScripts.Remove(instance.AppDomain);
@@ -805,7 +804,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 m_Scripts.Remove(itemID);
 
                 instance.ClearQueue();
-                bool stopped = instance.Stop(0);
+                instance.Stop(0);
 
 //                bool objectRemoved = false;
 
@@ -830,8 +829,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 instance.RemoveState();
                 instance.DestroyScriptInstance();
 
-                if (stopped)
-                    m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
+                m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
                 if (m_DomainScripts[instance.AppDomain].Count == 0)
                 {
                     m_DomainScripts.Remove(instance.AppDomain);
-- 
cgit v1.1