zontreck/OpenSim-Sasquatch
1
0
Fork 0
mirror of https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git synced 2024-11-21 06:26:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release/0.9.3.9037'
Some checks failed
CodeQL / Analyze (push) Has been cancelled
Details

Browse source
This commit is contained in:
Mike Dickson 2024-10-02 21:08:32 -04:00
commit 5d7d18b049
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OpenSim/Framework/VersionInfo.cs
View file

@ -39,7 +39,7 @@ namespace OpenSim
{
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
{

3
OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
View file

@ -545,7 +545,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
}
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"));