From b17596387876f98c79cdfde7680fa3d2528567e1 Mon Sep 17 00:00:00 2001 From: Cinder Date: Sat, 23 Apr 2022 10:38:11 -0500 Subject: [PATCH] Redundant ToString() calls --- LibreMetaverse/AgentManager.cs | 6 +++--- LibreMetaverse/AssetCache.cs | 6 +++--- LibreMetaverse/AssetManager.cs | 8 ++++---- .../Assets/Archiving/AssetsArchiver.cs | 4 ++-- LibreMetaverse/Assets/Archiving/OarFile.cs | 6 +++--- .../Assets/AssetTypes/AssetNotecard.cs | 2 +- LibreMetaverse/AvatarManager.cs | 16 ++++++++-------- LibreMetaverse/EstateTools.cs | 8 ++++---- LibreMetaverse/Imaging/BakeLayer.cs | 2 +- LibreMetaverse/Imaging/ManagedImage.cs | 2 +- LibreMetaverse/Inventory.cs | 2 +- LibreMetaverse/InventoryManager.cs | 4 ++-- LibreMetaverse/ObjectManager.cs | 4 ++-- LibreMetaverse/PacketDecoder.cs | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/LibreMetaverse/AgentManager.cs b/LibreMetaverse/AgentManager.cs index 87745192..c446dec9 100644 --- a/LibreMetaverse/AgentManager.cs +++ b/LibreMetaverse/AgentManager.cs @@ -3114,7 +3114,7 @@ namespace OpenMetaverse teleport.Info.Position = position; teleport.Info.RegionHandle = regionHandle; - Logger.Log("Requesting teleport to region handle " + regionHandle.ToString(), Helpers.LogLevel.Info, Client); + Logger.Log("Requesting teleport to region handle " + regionHandle, Helpers.LogLevel.Info, Client); Client.Network.SendPacket(teleport); } @@ -4151,8 +4151,8 @@ namespace OpenMetaverse } else { - Logger.Log("Got an AgentDataUpdate packet for avatar " + p.AgentData.AgentID.ToString() + - " instead of " + Client.Self.AgentID.ToString() + ", this shouldn't happen", Helpers.LogLevel.Error, Client); + Logger.Log("Got an AgentDataUpdate packet for avatar " + p.AgentData.AgentID + + " instead of " + Client.Self.AgentID + ", this shouldn't happen", Helpers.LogLevel.Error, Client); } } diff --git a/LibreMetaverse/AssetCache.cs b/LibreMetaverse/AssetCache.cs index 359bfbfc..9c19fd85 100644 --- a/LibreMetaverse/AssetCache.cs +++ b/LibreMetaverse/AssetCache.cs @@ -201,7 +201,7 @@ namespace OpenMetaverse { return ComputeAssetCacheFilename(Client.Settings.ASSET_CACHE_DIR, assetID); } - return Client.Settings.ASSET_CACHE_DIR + Path.DirectorySeparatorChar + assetID.ToString(); + return Client.Settings.ASSET_CACHE_DIR + Path.DirectorySeparatorChar + assetID; } /// @@ -211,7 +211,7 @@ namespace OpenMetaverse /// String with the file name of the static cached asset private string StaticFileName(UUID assetID) { - return Settings.RESOURCE_DIR + Path.DirectorySeparatorChar + "static_assets" + Path.DirectorySeparatorChar + assetID.ToString(); + return Settings.RESOURCE_DIR + Path.DirectorySeparatorChar + "static_assets" + Path.DirectorySeparatorChar + assetID; } /// @@ -412,7 +412,7 @@ namespace OpenMetaverse else if (byteCount >= 1024) size = String.Format("{0:##.##}", byteCount / 1024) + " KB"; else if (byteCount > 0 && byteCount < 1024) - size = byteCount.ToString() + " Bytes"; + size = byteCount + " Bytes"; return size; } diff --git a/LibreMetaverse/AssetManager.cs b/LibreMetaverse/AssetManager.cs index b1374e28..a46cf78b 100644 --- a/LibreMetaverse/AssetManager.cs +++ b/LibreMetaverse/AssetManager.cs @@ -1723,7 +1723,7 @@ namespace OpenMetaverse } else { - Logger.Log("Received a TransferInfo packet with a SourceType of " + download.Source.ToString() + + Logger.Log("Received a TransferInfo packet with a SourceType of " + download.Source + " and a Params field length of " + info.TransferInfo.Params.Length, Helpers.LogLevel.Warning, Client); } @@ -1762,7 +1762,7 @@ namespace OpenMetaverse if (download.Size == 0) { Logger.Log("Timed out while waiting for the asset header to download for " + - download.ID.ToString(), Helpers.LogLevel.Warning, Client); + download.ID, Helpers.LogLevel.Warning, Client); // Abort the transfer TransferAbortPacket abort = new TransferAbortPacket(); @@ -1818,7 +1818,7 @@ namespace OpenMetaverse // Check if we downloaded the full asset if (download.Transferred >= download.Size) { - Logger.DebugLog("Transfer for asset " + download.AssetID.ToString() + " completed", Client); + Logger.DebugLog("Transfer for asset " + download.AssetID + " completed", Client); download.Success = true; lock (Transfers) Transfers.Remove(download.ID); @@ -2032,7 +2032,7 @@ namespace OpenMetaverse if (!String.IsNullOrEmpty(download.Filename)) Logger.DebugLog("Xfer download for asset " + download.Filename + " completed", Client); else - Logger.DebugLog("Xfer download for asset " + download.VFileID.ToString() + " completed", Client); + Logger.DebugLog("Xfer download for asset " + download.VFileID + " completed", Client); download.Success = true; lock (Transfers) Transfers.Remove(download.ID); diff --git a/LibreMetaverse/Assets/Archiving/AssetsArchiver.cs b/LibreMetaverse/Assets/Archiving/AssetsArchiver.cs index 7f78fc9b..3166e064 100644 --- a/LibreMetaverse/Assets/Archiving/AssetsArchiver.cs +++ b/LibreMetaverse/Assets/Archiving/AssetsArchiver.cs @@ -90,7 +90,7 @@ namespace OpenMetaverse.Assets extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.AssetType]; } - xtw.WriteElementString("filename", uuid.ToString() + extension); + xtw.WriteElementString("filename", uuid + extension); xtw.WriteElementString("name", uuid.ToString()); xtw.WriteElementString("description", String.Empty); @@ -137,7 +137,7 @@ namespace OpenMetaverse.Assets asset.Encode(); archive.WriteFile( - ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension, + ArchiveConstants.ASSETS_PATH + uuid + extension, asset.AssetData); assetsAdded++; diff --git a/LibreMetaverse/Assets/Archiving/OarFile.cs b/LibreMetaverse/Assets/Archiving/OarFile.cs index 5f5ec35e..56748633 100644 --- a/LibreMetaverse/Assets/Archiving/OarFile.cs +++ b/LibreMetaverse/Assets/Archiving/OarFile.cs @@ -587,7 +587,7 @@ namespace OpenMetaverse.Assets if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(assetType)) extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[assetType]; - File.WriteAllBytes(Path.Combine(assetsPath, texture.ToString() + extension), assetTexture.AssetData); + File.WriteAllBytes(Path.Combine(assetsPath, texture + extension), assetTexture.AssetData); remainingTextures.Remove(assetTexture.AssetID); if (remainingTextures.Count == 0) AllPropertiesReceived.Set(); @@ -609,7 +609,7 @@ namespace OpenMetaverse.Assets if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(assetType)) extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[assetType]; - File.WriteAllBytes(Path.Combine(assetsPath, texture.ToString() + extension), asset.AssetData); + File.WriteAllBytes(Path.Combine(assetsPath, texture + extension), asset.AssetData); remainingTextures.Remove(asset.AssetID); if (remainingTextures.Count == 0) AllPropertiesReceived.Set(); @@ -643,7 +643,7 @@ namespace OpenMetaverse.Assets AllPropertiesReceived.Set(); return; } - File.WriteAllBytes(Path.Combine(assetsPath, assetID.ToString() + extension), asset.AssetData); + File.WriteAllBytes(Path.Combine(assetsPath, assetID + extension), asset.AssetData); ++count; AllPropertiesReceived.Set(); }); diff --git a/LibreMetaverse/Assets/AssetTypes/AssetNotecard.cs b/LibreMetaverse/Assets/AssetTypes/AssetNotecard.cs index 2a5e2ea5..04687943 100644 --- a/LibreMetaverse/Assets/AssetTypes/AssetNotecard.cs +++ b/LibreMetaverse/Assets/AssetTypes/AssetNotecard.cs @@ -146,7 +146,7 @@ namespace OpenMetaverse.Assets } output.Append("}\n"); - output.Append("Text length " + (Utils.StringToBytes(body).Length - 1).ToString() + "\n"); + output.Append("Text length " + (Utils.StringToBytes(body).Length - 1) + "\n"); output.Append(body + "}\n"); AssetData = Utils.StringToBytes(output.ToString()); diff --git a/LibreMetaverse/AvatarManager.cs b/LibreMetaverse/AvatarManager.cs index c2876476..ca515937 100644 --- a/LibreMetaverse/AvatarManager.cs +++ b/LibreMetaverse/AvatarManager.cs @@ -1221,31 +1221,31 @@ namespace OpenMetaverse switch (type) { case EffectType.Text: - Logger.Log("Received a ViewerEffect of type " + type.ToString() + ", implement me!", + Logger.Log("Received a ViewerEffect of type " + type + ", implement me!", Helpers.LogLevel.Warning, Client); break; case EffectType.Icon: - Logger.Log("Received a ViewerEffect of type " + type.ToString() + ", implement me!", + Logger.Log("Received a ViewerEffect of type " + type + ", implement me!", Helpers.LogLevel.Warning, Client); break; case EffectType.Connector: - Logger.Log("Received a ViewerEffect of type " + type.ToString() + ", implement me!", + Logger.Log("Received a ViewerEffect of type " + type + ", implement me!", Helpers.LogLevel.Warning, Client); break; case EffectType.FlexibleObject: - Logger.Log("Received a ViewerEffect of type " + type.ToString() + ", implement me!", + Logger.Log("Received a ViewerEffect of type " + type + ", implement me!", Helpers.LogLevel.Warning, Client); break; case EffectType.AnimalControls: - Logger.Log("Received a ViewerEffect of type " + type.ToString() + ", implement me!", + Logger.Log("Received a ViewerEffect of type " + type + ", implement me!", Helpers.LogLevel.Warning, Client); break; case EffectType.AnimationObject: - Logger.Log("Received a ViewerEffect of type " + type.ToString() + ", implement me!", + Logger.Log("Received a ViewerEffect of type " + type + ", implement me!", Helpers.LogLevel.Warning, Client); break; case EffectType.Cloth: - Logger.Log("Received a ViewerEffect of type " + type.ToString() + ", implement me!", + Logger.Log("Received a ViewerEffect of type " + type + ", implement me!", Helpers.LogLevel.Warning, Client); break; case EffectType.Glow: @@ -1269,7 +1269,7 @@ namespace OpenMetaverse } else { - Logger.Log("Received a " + type.ToString() + + Logger.Log("Received a " + type + " ViewerEffect with an incorrect TypeData size of " + block.TypeData.Length + " bytes", Helpers.LogLevel.Warning, Client); } diff --git a/LibreMetaverse/EstateTools.cs b/LibreMetaverse/EstateTools.cs index a498e8db..12761e0a 100644 --- a/LibreMetaverse/EstateTools.cs +++ b/LibreMetaverse/EstateTools.cs @@ -600,10 +600,10 @@ namespace OpenMetaverse public void SetRegionTerrain(UUID low, UUID midLow, UUID midHigh, UUID high) { List listParams = new List(); - listParams.Add("0 " + low.ToString()); - listParams.Add("1 " + midLow.ToString()); - listParams.Add("2 " + midHigh.ToString()); - listParams.Add("3 " + high.ToString()); + listParams.Add("0 " + low); + listParams.Add("1 " + midLow); + listParams.Add("2 " + midHigh); + listParams.Add("3 " + high); EstateOwnerMessage("texturedetail", listParams); EstateOwnerMessage("texturecommit", ""); } diff --git a/LibreMetaverse/Imaging/BakeLayer.cs b/LibreMetaverse/Imaging/BakeLayer.cs index 7e733ddd..392f3fd1 100644 --- a/LibreMetaverse/Imaging/BakeLayer.cs +++ b/LibreMetaverse/Imaging/BakeLayer.cs @@ -337,7 +337,7 @@ namespace OpenMetaverse.Imaging } // Apply any alpha wearable textures to make parts of the avatar disappear - Logger.Log("[XBakes]: Number of alpha wearable textures: " + alphaWearableTextures.Count.ToString(), Helpers.LogLevel.Debug); + Logger.Log("[XBakes]: Number of alpha wearable textures: " + alphaWearableTextures.Count, Helpers.LogLevel.Debug); foreach (ManagedImage img in alphaWearableTextures) AddAlpha(bakedTexture.Image, img); diff --git a/LibreMetaverse/Imaging/ManagedImage.cs b/LibreMetaverse/Imaging/ManagedImage.cs index 6be4144e..2d716ab0 100644 --- a/LibreMetaverse/Imaging/ManagedImage.cs +++ b/LibreMetaverse/Imaging/ManagedImage.cs @@ -217,7 +217,7 @@ namespace OpenMetaverse.Imaging } else { - throw new NotSupportedException("Unrecognized pixel format: " + bitmap.PixelFormat.ToString()); + throw new NotSupportedException("Unrecognized pixel format: " + bitmap.PixelFormat); } } #endif diff --git a/LibreMetaverse/Inventory.cs b/LibreMetaverse/Inventory.cs index 66a12912..8010cd44 100644 --- a/LibreMetaverse/Inventory.cs +++ b/LibreMetaverse/Inventory.cs @@ -420,7 +420,7 @@ namespace OpenMetaverse if (cacheFolder.Version != server_folder.Version) { - Logger.DebugLog("Inventory Cache/Server version mismatch on " + node.Data.Name + " " + cacheFolder.Version.ToString() + " vs " + server_folder.Version.ToString()); + Logger.DebugLog("Inventory Cache/Server version mismatch on " + node.Data.Name + " " + cacheFolder.Version + " vs " + server_folder.Version); pnode.NeedsUpdate = true; dirty_folders.Add(node.Data.UUID); } diff --git a/LibreMetaverse/InventoryManager.cs b/LibreMetaverse/InventoryManager.cs index 7ca7a962..5f104626 100644 --- a/LibreMetaverse/InventoryManager.cs +++ b/LibreMetaverse/InventoryManager.cs @@ -3711,7 +3711,7 @@ namespace OpenMetaverse // Initialize the store here so we know who owns it: _Store = new Inventory(Client, this, Client.Self.AgentID); - Logger.DebugLog("Setting InventoryRoot to " + replyData.InventoryRoot.ToString(), Client); + Logger.DebugLog("Setting InventoryRoot to " + replyData.InventoryRoot, Client); InventoryFolder rootFolder = new InventoryFolder(replyData.InventoryRoot) { Name = String.Empty, @@ -3984,7 +3984,7 @@ namespace OpenMetaverse } else { - Logger.Log("Don't have a reference to FolderID " + reply.AgentData.FolderID.ToString() + + Logger.Log("Don't have a reference to FolderID " + reply.AgentData.FolderID + " or it is not a folder", Helpers.LogLevel.Error, Client); return; } diff --git a/LibreMetaverse/ObjectManager.cs b/LibreMetaverse/ObjectManager.cs index 71357612..e1b30cf2 100644 --- a/LibreMetaverse/ObjectManager.cs +++ b/LibreMetaverse/ObjectManager.cs @@ -2193,7 +2193,7 @@ namespace OpenMetaverse DecodeParticleUpdate(block); break; default: - Logger.DebugLog("Got an ObjectUpdate block with an unrecognized PCode " + pcode.ToString(), Client); + Logger.DebugLog("Got an ObjectUpdate block with an unrecognized PCode " + pcode, Client); break; } } @@ -3022,7 +3022,7 @@ namespace OpenMetaverse prim.PathRevolutions = 1f; break; default: - throw new NotSupportedException("Unsupported shape: " + type.ToString()); + throw new NotSupportedException("Unsupported shape: " + type); } return prim; diff --git a/LibreMetaverse/PacketDecoder.cs b/LibreMetaverse/PacketDecoder.cs index dd897631..77261201 100644 --- a/LibreMetaverse/PacketDecoder.cs +++ b/LibreMetaverse/PacketDecoder.cs @@ -883,7 +883,7 @@ namespace OpenMetaverse.Packets if (hasMeshFlags) { result.AppendFormat("{0,30}", "" + Environment.NewLine); - result.AppendFormat("{0,30}", meshFlags.ToString() + Environment.NewLine); + result.AppendFormat("{0,30}", meshFlags + Environment.NewLine); result.AppendFormat("{0,30}", "" + Environment.NewLine); }