OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Next OSG test. Don't remove app domains if they contain running threads.

0.6.9-post-fixes
Melanie 2010-06-02 19:57:03 +01:00
parent 20e6b7a320
commit f831a1778b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

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