From 2a196190d99b50b2ddac60c8436b54bddea40a4d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 14 Mar 2022 20:21:18 +0000 Subject: [PATCH] ..Equals() is also not good --- OpenSim/Framework/ChildAgentDataUpdate.cs | 4 ++-- OpenSim/Framework/IClientAPI.cs | 1 + OpenSim/Framework/RegionInfo.cs | 6 +++--- .../CoreModules/Scripting/EMailModules/EmailModule.cs | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 431c1f89e8..07b33e7e94 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs @@ -541,10 +541,10 @@ namespace OpenSim.Framework args["controllers"] = controls; } - if ((CallbackURI != null) && (!CallbackURI.Equals(""))) + if (!string.IsNullOrEmpty(CallbackURI)) args["callback_uri"] = OSD.FromString(CallbackURI); - if ((NewCallbackURI != null) && (!NewCallbackURI.Equals(""))) + if (!string.IsNullOrEmpty(NewCallbackURI)) args["cb_uri"] = OSD.FromString(NewCallbackURI); // Attachment objects for fatpack messages diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 61bef320db..18c8890431 100755 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -757,6 +757,7 @@ namespace OpenSim.Framework event DeRezObject OnDeRezObject; event RezRestoreToWorld OnRezRestoreToWorld; event Action OnRegionHandShakeReply; + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly")] event GenericCall1 OnRequestWearables; event Action OnCompleteMovementToRegion; diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 386c649cea..507c51852b 100755 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -1090,7 +1090,7 @@ namespace OpenSim.Framework { OSDMap args = new OSDMap(); args["region_id"] = OSD.FromUUID(RegionID); - if ((RegionName != null) && !RegionName.Equals("")) + if (!string.IsNullOrEmpty(RegionName)) args["region_name"] = OSD.FromString(RegionName); args["external_host_name"] = OSD.FromString(ExternalHostName); args["http_port"] = OSD.FromString(HttpPort.ToString()); @@ -1104,10 +1104,10 @@ namespace OpenSim.Framework args["internal_ep_address"] = OSD.FromString(InternalEndPoint.Address.ToString()); args["internal_ep_port"] = OSD.FromString(InternalEndPoint.Port.ToString()); - if ((RemotingAddress != null) && !RemotingAddress.Equals("")) + if (!string.IsNullOrEmpty(RemotingAddress)) args["remoting_address"] = OSD.FromString(RemotingAddress); args["remoting_port"] = OSD.FromString(RemotingPort.ToString()); - if ((proxyUrl != null) && !proxyUrl.Equals("")) + if (!string.IsNullOrEmpty(proxyUrl)) args["proxy_url"] = OSD.FromString(proxyUrl); if (RegionType != String.Empty) args["region_type"] = OSD.FromString(RegionType); diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index 36e227ba84..813d36a90f 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs @@ -411,8 +411,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules for (i = 0; i < queue.Count; i++) { - if ((sender == null || sender.Equals("") || sender.Equals(queue[i].sender)) && - (subject == null || subject.Equals("") || subject.Equals(queue[i].subject))) + if ((string.IsNullOrEmpty(sender) || sender.Equals(queue[i].sender)) && + (string.IsNullOrEmpty(subject) || subject.Equals(queue[i].subject))) { break; }