From 1d7acb7bcb127e2559818c3f5b38f77d435b98b1 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 30 Aug 2022 02:52:58 +0100 Subject: [PATCH] avoid a null ref --- .../Region/ScriptEngine/YEngine/XMRInstCapture.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs index c2a6d052de..1abaca4a3d 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs @@ -149,10 +149,11 @@ namespace OpenSim.Region.ScriptEngine.Yengine // "DetectParams" are returned by llDetected...() script functions // for the currently active event, if any. - if(m_DetectParams != null) + var detectParams = m_DetectParams; + if (detectParams != null) { XmlElement detParArrayN = doc.CreateElement("", "DetectArray", ""); - AppendXMLDetectArray(doc, detParArrayN, m_DetectParams); + AppendXMLDetectArray(doc, detParArrayN, detectParams); scriptStateN.AppendChild(detParArrayN); } //m_RunOnePhase = "GetExecutionState F"; @@ -231,11 +232,15 @@ namespace OpenSim.Region.ScriptEngine.Yengine */ private static void AppendXMLDetectArray(XmlDocument doc, XmlElement parent, DetectParams[] detect) { - foreach(DetectParams d in detect) + try { - XmlElement detectParamsN = GetXMLDetect(doc, d); - parent.AppendChild(detectParamsN); + foreach(DetectParams d in detect) + { + XmlElement detectParamsN = GetXMLDetect(doc, d); + parent.AppendChild(detectParamsN); + } } + catch { } } private static XmlElement GetXMLDetect(XmlDocument doc, DetectParams d)