From f44569eee52f3da88e93bb5aaaea2a08aea42ada Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 15 Nov 2018 01:24:46 +0000 Subject: Yengine: ignore llResetScript() in default state_entry like X does. No idea why some do it, but do --- OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs index b6f8874..6fe11d8 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs @@ -215,6 +215,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine */ public void ApiReset() { + // do not do llResetScript on entry + if(eventCode == ScriptEventCode.state_entry && stateCode == 0) + return; ClearQueueExceptLinkMessages(); throw new ScriptResetException(); } -- cgit v1.1