From 0281a9f87b8f0f2c0f54876c3e29eeb0b626bb83 Mon Sep 17 00:00:00 2001 From: Mike Dickson Date: Sat, 28 Sep 2024 16:09:04 -0400 Subject: [PATCH] Fix for the script reset that was occuring exactly once on region startup. If you are loading script state from a region that was not previously running experiences a variable would be null and the null needed to be tested for when parsing a UUID. After this initial load the experience entry is saved and exists on future restarts. Also bumped the version number to 9037 --- OpenSim/Framework/VersionInfo.cs | 2 +- OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index 1604605ca2..aa7e7a0d80 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs @@ -39,7 +39,7 @@ public class VersionInfo { public const string VersionNumber = "0.9.3"; public const string AssemblyVersionNumber = "0.9.3"; - public const string Release = "9032"; + public const string Release = "9037"; public static string Version { diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs index 4fc2b6a621..1d4a0e9654 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs @@ -545,7 +545,8 @@ private void LoadScriptState(XmlDocument doc) } XmlElement experienceKey = (XmlElement)scriptStateN.SelectSingleNode("ExperienceKey"); - m_Item.ExperienceID = UUID.Parse(experienceKey.InnerText); + if (experienceKey is not null) + m_Item.ExperienceID = UUID.Parse(experienceKey.InnerText); XmlElement permissionsN = (XmlElement)scriptStateN.SelectSingleNode("Permissions"); m_Item.PermsGranter = new UUID(permissionsN.GetAttribute("granter"));