ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2021-05-29 15:39:01 +01:00
parent a23bf4eb1b
commit ee530d438f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -1068,9 +1068,9 @@ namespace OpenSim.Region.Framework.Scenes
else
{
string tile = Util.GetConfigVarFromSections<string>(
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<string>(config, "DeniedClients", possibleAccessControlConfigSections, String.Empty);
grant = Util.GetConfigVarFromSections<string>(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<string>(
config, "BannedClients", possibleAccessControlConfigSections, String.Empty);
if (string.IsNullOrWhiteSpace(grant))
grant = Util.GetConfigVarFromSections<string>(config, "BannedClients", possibleAccessControlConfigSections, string.Empty);
if (grant.Length > 0)
{

4
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@@ -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);