diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index a9a2dbf..613c241 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -683,7 +683,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
683 | if (m_SaveState) | 683 | if (m_SaveState) |
684 | { | 684 | { |
685 | // This will be the very first event we deliver | 685 | // This will be the very first event we deliver |
686 | // (state_entry) in defualt state | 686 | // (state_entry) in default state |
687 | // | 687 | // |
688 | 688 | ||
689 | SaveState(m_Assembly); | 689 | SaveState(m_Assembly); |
@@ -942,6 +942,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
942 | bool run = Running; | 942 | bool run = Running; |
943 | Stop(100); | 943 | Stop(100); |
944 | Running = run; | 944 | Running = run; |
945 | |||
946 | // We should not be doing this, but since we are about to | ||
947 | // dispose this, it really doesn't make a difference | ||
948 | // This is meant to work around a Windows only race | ||
949 | // | ||
950 | m_InEvent = false; | ||
951 | |||
945 | return ScriptSerializer.Serialize(this); | 952 | return ScriptSerializer.Serialize(this); |
946 | } | 953 | } |
947 | } | 954 | } |