From f2f183b307ab8cb0c765747098b3cb4eb385ab0c Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sat, 31 May 2008 00:45:37 +0000 Subject: Mantis#1425. Thank you kindly, Melanie for a patch that: 0001425: [PATCH] Correct llResetOtherScript() behavoir in XEngine --- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 3ca03b2..cbcf5ea 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -1082,12 +1082,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine public void ResetScript() { + bool running=Running; + Stop(0); m_Engine.m_ASYNCLSLCommandManager.RemoveScript(m_LocalID, m_ItemID); m_EventQueue.Clear(); m_Script.ResetVars(); m_State = "default"; - Start(); + if(running) + Start(); PostEvent(new XEventParams("state_entry", new Object[0], new XDetectParams[0])); } -- cgit v1.1