From 472c24336287f864ba55ab217f380d33d6332ed8 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 10 Nov 2022 16:10:47 +0000 Subject: [PATCH] add some null refs checks on script removal --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 4 ++-- OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index d1a233834c..15ba8f0382 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs @@ -91,7 +91,7 @@ namespace OpenSim.Region.Framework.Scenes { SceneObjectPart[] parts = m_parts.GetArray(); for (int i = 0; i < parts.Length; i++) - parts[i].Inventory.RemoveScriptInstances(sceneObjectBeingDeleted); + parts[i]?.Inventory?.RemoveScriptInstances(sceneObjectBeingDeleted); } /// @@ -101,7 +101,7 @@ namespace OpenSim.Region.Framework.Scenes { SceneObjectPart[] parts = m_parts.GetArray(); for(int i = 0; i < parts.Length; ++i) - parts[i].Inventory.StopScriptInstances(); + parts[i]?.Inventory?.StopScriptInstances(); } public void SendReleaseScriptsControl() diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs index 3dd7573481..cc5ee2d2df 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs @@ -513,7 +513,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine stackFrames = null; m_DetectParams = null; - if (m_Part == null || m_Part.Inventory == null) + if (m_Part is null || m_Part.Inventory is null || m_Part.ParentGroup is null) { //we are gone and don't know it still m_SleepUntil = DateTime.MaxValue;