From 743f3af745b7e983f30ad6acac4002f141dd2342 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 20 Nov 2021 03:54:03 +0000 Subject: [PATCH] force yengine scripts recomp --- .../ScriptEngine/YEngine/MMRScriptCodeGen.cs | 2 +- .../Region/ScriptEngine/YEngine/XMRInstRun.cs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs index a35dcdc34d..d4659e8929 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs @@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine { public static readonly string OBJECT_CODE_MAGIC = "YObjectCode"; // reserve positive version values for original xmr - public static int COMPILED_VERSION_VALUE = -8; // decremented when compiler or object file changes + public static int COMPILED_VERSION_VALUE = -9; // decremented when compiler or object file changes public static readonly int CALL_FRAME_MEMUSE = 64; public static readonly int STRING_LEN_TO_MEMUSE = 2; diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs index 4b90ab8df3..716779d3b3 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs @@ -261,6 +261,14 @@ namespace OpenSim.Region.ScriptEngine.Yengine // ONSLEEPQ, ONYIELDQ, SUSPENDED or FINISHED. public XMRInstState RunOne() { + // someone may have called Suspend(). + //m_RunOnePhase = "check m_SuspendCount"; + if (m_SuspendCount > 0) + { + //m_RunOnePhase = "return is suspended"; + return XMRInstState.SUSPENDED; + } + DateTime now = DateTime.UtcNow; m_SliceStart = Util.GetTimeStampMS(); @@ -272,14 +280,6 @@ namespace OpenSim.Region.ScriptEngine.Yengine return XMRInstState.ONSLEEPQ; } - // Also, someone may have called Suspend(). - //m_RunOnePhase = "check m_SuspendCount"; - if(m_SuspendCount > 0) - { - //m_RunOnePhase = "return is suspended"; - return XMRInstState.SUSPENDED; - } - // Make sure we aren't being migrated in or out and prevent that // whilst we are in here. If migration has it locked, don't call // back right away, delay a bit so we don't get in infinite loop.