diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ef102165bc..ac93ad4be1 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1068,9 +1068,9 @@ namespace OpenSim.Region.Framework.Scenes else { string tile = Util.GetConfigVarFromSections( - config, "MaptileStaticUUID", possibleMapConfigSections, UUID.Zero.ToString()); + config, "MaptileStaticUUID", possibleMapConfigSections, Util.UUIDZeroString); - if (tile != UUID.Zero.ToString() && UUID.TryParse(tile, out UUID tileID)) + if (tile != Util.UUIDZeroString && UUID.TryParse(tile, out UUID tileID)) { RegionInfo.RegionSettings.TerrainImageID = tileID; } @@ -1094,11 +1094,10 @@ namespace OpenSim.Region.Framework.Scenes } } - grant = Util.GetConfigVarFromSections(config, "DeniedClients", possibleAccessControlConfigSections, String.Empty); + grant = Util.GetConfigVarFromSections(config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); // Deal with the mess of someone having used a different word at some point - if (grant == String.Empty) - grant = Util.GetConfigVarFromSections( - config, "BannedClients", possibleAccessControlConfigSections, String.Empty); + if (string.IsNullOrWhiteSpace(grant)) + grant = Util.GetConfigVarFromSections(config, "BannedClients", possibleAccessControlConfigSections, string.Empty); if (grant.Length > 0) { diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 7a3b1e26f9..87863e8b1b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1040,7 +1040,7 @@ namespace OpenSim.Region.ScriptEngine.Shared // now, this makes the math easier int remove = end - start; - if(Data.Length <= remove) + if(remove >= Data.Length) return new list(new object[0]); ret = new object[Data.Length - remove]; @@ -1048,7 +1048,7 @@ namespace OpenSim.Region.ScriptEngine.Shared if (start > 0) Array.Copy(Data, 0, ret, 0, start); - if(end > Data.Length - 1) + if(end >= Data.Length) return new list(ret); Array.Copy(Data, end, ret, start, Data.Length - end);