From a3479e8c9957f5bec74dc320a3c8c0a448e7d324 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 14 Oct 2021 14:37:14 +0100 Subject: [PATCH] YEngine changed region and teleport are sent together --- OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs index e17535232f..531788a5e6 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs @@ -433,10 +433,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine case StateSource.Teleporting: PostEvent(new EventParams("changed", - sbcCR, - zeroDetectParams)); - PostEvent(new EventParams("changed", - sbcCT, + sbcCRT, zeroDetectParams)); break; @@ -451,6 +448,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine private static Object[] sbcCRS = new Object[] { ScriptBaseClass.CHANGED_REGION_START }; private static Object[] sbcCR = new Object[] { ScriptBaseClass.CHANGED_REGION }; private static Object[] sbcCT = new Object[] { ScriptBaseClass.CHANGED_TELEPORT }; + private static Object[] sbcCRT = new Object[] { ScriptBaseClass.CHANGED_REGION | ScriptBaseClass.CHANGED_TELEPORT }; /** * @brief Save compilation error messages for later retrieval