aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorCharles Krinke2008-05-31 00:45:37 +0000
committerCharles Krinke2008-05-31 00:45:37 +0000
commitf2f183b307ab8cb0c765747098b3cb4eb385ab0c (patch)
tree8f887380317fe48acd2a31118372331246c68574 /OpenSim
parent* If you check fixed sun, in the estate tools 'terrain tab', the sun will fix... (diff)
downloadopensim-SC_OLD-f2f183b307ab8cb0c765747098b3cb4eb385ab0c.zip
opensim-SC_OLD-f2f183b307ab8cb0c765747098b3cb4eb385ab0c.tar.gz
opensim-SC_OLD-f2f183b307ab8cb0c765747098b3cb4eb385ab0c.tar.bz2
opensim-SC_OLD-f2f183b307ab8cb0c765747098b3cb4eb385ab0c.tar.xz
Mantis#1425. Thank you kindly, Melanie for a patch that:
0001425: [PATCH] Correct llResetOtherScript() behavoir in XEngine
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
1 files changed, 4 insertions, 1 deletions
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
1082 1082
1083 public void ResetScript() 1083 public void ResetScript()
1084 { 1084 {
1085 bool running=Running;
1086
1085 Stop(0); 1087 Stop(0);
1086 m_Engine.m_ASYNCLSLCommandManager.RemoveScript(m_LocalID, m_ItemID); 1088 m_Engine.m_ASYNCLSLCommandManager.RemoveScript(m_LocalID, m_ItemID);
1087 m_EventQueue.Clear(); 1089 m_EventQueue.Clear();
1088 m_Script.ResetVars(); 1090 m_Script.ResetVars();
1089 m_State = "default"; 1091 m_State = "default";
1090 Start(); 1092 if(running)
1093 Start();
1091 PostEvent(new XEventParams("state_entry", 1094 PostEvent(new XEventParams("state_entry",
1092 new Object[0], new XDetectParams[0])); 1095 new Object[0], new XDetectParams[0]));
1093 } 1096 }