From e1ce7408da19e05d83528c1da1f12d7c86969b64 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 13 Mar 2022 02:05:56 +0000 Subject: [PATCH] a few more use array.Empty --- OpenSim/Framework/RegionURI.cs | 4 +++- OpenSim/Framework/TerrainData.cs | 4 ++-- OpenSim/Framework/Tests/CacheTests.cs | 2 +- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++---- .../Authentication/AuthenticationServerPostHandler.cs | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/OpenSim/Framework/RegionURI.cs b/OpenSim/Framework/RegionURI.cs index 22f47b3252..56bb04416f 100644 --- a/OpenSim/Framework/RegionURI.cs +++ b/OpenSim/Framework/RegionURI.cs @@ -140,10 +140,12 @@ namespace OpenSim.Framework switch (tmpSlice.ToString()) { + case "http": case "hg": case "hop": - case "http": case "surl": + case "x-grid-info": + // only https has this defined if (issecure) { Schema = "https://"; diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs index 70f7e6d011..e093f6bcbd 100644 --- a/OpenSim/Framework/TerrainData.cs +++ b/OpenSim/Framework/TerrainData.cs @@ -75,8 +75,8 @@ namespace OpenSim.Framework // Remember subregions of the heightmap that has changed. private BitArray m_taint; - private int m_taintSizeX; - private int m_taintSizeY; + private readonly int m_taintSizeX; + private readonly int m_taintSizeY; // legacy CompressionFactor public float CompressionFactor { get; private set; } diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs index a92ff3c036..fc7df692b9 100644 --- a/OpenSim/Framework/Tests/CacheTests.cs +++ b/OpenSim/Framework/Tests/CacheTests.cs @@ -106,7 +106,7 @@ namespace OpenSim.Framework.Tests { UUID Random1 = UUID.Random(); UUID Random2 = UUID.Random(); - byte[] data = new byte[0]; + byte[] data = Array.Empty(); CacheItemBase cb1 = new CacheItemBase(Random1.ToString(), DateTime.Now + TimeSpan.FromDays(1)); CacheItemBase cb2 = new CacheItemBase(Random2.ToString(), DateTime.Now + TimeSpan.FromDays(1)); CacheItemBase cb3 = new CacheItemBase(Random1.ToString(), DateTime.Now + TimeSpan.FromDays(1)); diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index af3db8db59..4c3839e493 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -2430,12 +2430,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP packet.ItemData[0].AssetID = UUID.Zero; packet.ItemData[0].CreatorID = UUID.Zero; packet.ItemData[0].BaseMask = 0; - packet.ItemData[0].Description = new byte[0]; + packet.ItemData[0].Description = Array.Empty(); packet.ItemData[0].EveryoneMask = 0; packet.ItemData[0].OwnerMask = 0; packet.ItemData[0].FolderID = UUID.Zero; packet.ItemData[0].InvType = (sbyte)0; - packet.ItemData[0].Name = new byte[0]; + packet.ItemData[0].Name = Array.Empty(); packet.ItemData[0].NextOwnerMask = 0; packet.ItemData[0].OwnerID = UUID.Zero; packet.ItemData[0].Type = -1; @@ -2728,7 +2728,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP bulkUpdate.FolderData[0].FolderID = UUID.Zero; bulkUpdate.FolderData[0].ParentID = UUID.Zero; bulkUpdate.FolderData[0].Type = -1; - bulkUpdate.FolderData[0].Name = new byte[0]; + bulkUpdate.FolderData[0].Name = Array.Empty(); bulkUpdate.ItemData = new BulkUpdateInventoryPacket.ItemDataBlock[1]; bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock(); @@ -12682,7 +12682,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); cachedresp.WearableData[i].TextureIndex = (byte)cachedTextures[i].BakedTextureIndex; cachedresp.WearableData[i].TextureID = cachedTextures[i].BakedTextureID; - cachedresp.WearableData[i].HostName = new byte[0]; + cachedresp.WearableData[i].HostName = Array.Empty(); } cachedresp.Header.Zerocoded = true; diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs index d1430a0c20..3455229b40 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs @@ -97,7 +97,7 @@ namespace OpenSim.Server.Handlers.Authentication return DoEncryptedMethods(buffer); } } - return new byte[0]; + return Array.Empty(); } private byte[] DoPlainMethods(string body)