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

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

This reverts commit f831a1778b.

With this, post-fixes is back to normal.
0.6.9-post-fixes
Melanie 2010-06-02 21:02:53 +01:00
parent f831a1778b
commit 82d0d1c092
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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();
bool stopped = instance.Stop(0); instance.Stop(0);
// Release events, timer, etc // Release events, timer, etc
// //
@ -287,8 +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)
{ {
m_DomainScripts.Remove(instance.AppDomain); m_DomainScripts.Remove(instance.AppDomain);
@ -805,7 +804,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_Scripts.Remove(itemID); m_Scripts.Remove(itemID);
instance.ClearQueue(); instance.ClearQueue();
bool stopped = instance.Stop(0); instance.Stop(0);
// bool objectRemoved = false; // bool objectRemoved = false;
@ -830,8 +829,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)
{ {
m_DomainScripts.Remove(instance.AppDomain); m_DomainScripts.Remove(instance.AppDomain);