diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 1d15d61..674144b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -1018,11 +1018,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
1018 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; | 1018 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; |
1019 | part.CollisionSound = UUID.Zero; | 1019 | part.CollisionSound = UUID.Zero; |
1020 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); | 1020 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); |
1021 | |||
1022 | m_TimerQueued = false; | ||
1023 | m_StateChangeInProgress = false; | ||
1021 | EventQueue.Clear(); | 1024 | EventQueue.Clear(); |
1025 | |||
1022 | m_Script.ResetVars(); | 1026 | m_Script.ResetVars(); |
1023 | StartParam = 0; | 1027 | StartParam = 0; |
1024 | State = "default"; | 1028 | State = "default"; |
1025 | 1029 | ||
1030 | |||
1026 | part.SetScriptEvents(ItemID, | 1031 | part.SetScriptEvents(ItemID, |
1027 | (int)m_Script.GetStateEventFlags(State)); | 1032 | (int)m_Script.GetStateEventFlags(State)); |
1028 | if (running) | 1033 | if (running) |
@@ -1049,6 +1054,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
1049 | part.CollisionSound = UUID.Zero; | 1054 | part.CollisionSound = UUID.Zero; |
1050 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); | 1055 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); |
1051 | 1056 | ||
1057 | m_TimerQueued = false; | ||
1058 | m_StateChangeInProgress = false; | ||
1052 | EventQueue.Clear(); | 1059 | EventQueue.Clear(); |
1053 | m_Script.ResetVars(); | 1060 | m_Script.ResetVars(); |
1054 | string oldState = State; | 1061 | string oldState = State; |