ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-03 17:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix a Windows only race in thread termination

Browse Source
This commit is contained in:
Melanie Thielker
2009-02-19 05:16:25 +00:00
parent 863556f2cc
commit 2478d38b85
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -683,7 +683,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
if (m_SaveState)
{
// This will be the very first event we deliver
// (state_entry) in defualt state
// (state_entry) in default state
//
SaveState(m_Assembly);
@@ -942,6 +942,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
bool run = Running;
Stop(100);
Running = run;
// We should not be doing this, but since we are about to
// dispose this, it really doesn't make a difference
// This is meant to work around a Windows only race
//
m_InEvent = false;
return ScriptSerializer.Serialize(this);
}
}