From 0abb08c6eff3edb761cf0f94f41a7dc5fa1c8a9d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 31 Aug 2020 14:18:13 +0100 Subject: [PATCH] replace heavy Enum.HasFlag crap --- OpenSim/Framework/IClientAPI.cs | 10 +++++----- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 7ac87122e8..876c7c9c70 100755 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -601,9 +601,9 @@ namespace OpenSim.Framework public virtual void Update() { // we are on the new one - if (m_flags.HasFlag(PrimUpdateFlags.CancelKill)) + if ((m_flags & PrimUpdateFlags.CancelKill) != 0) { - if (m_flags.HasFlag(PrimUpdateFlags.UpdateProbe)) + if ((m_flags & PrimUpdateFlags.UpdateProbe) != 0) m_flags = PrimUpdateFlags.UpdateProbe; else m_flags = PrimUpdateFlags.FullUpdatewithAnim; @@ -614,11 +614,11 @@ namespace OpenSim.Framework { // we are on the new one PrimUpdateFlags updateFlags = oldupdate.Flags; - if (updateFlags.HasFlag(PrimUpdateFlags.UpdateProbe)) + if ((m_flags & PrimUpdateFlags.UpdateProbe) != 0) updateFlags &= ~PrimUpdateFlags.UpdateProbe; - if (m_flags.HasFlag(PrimUpdateFlags.CancelKill)) + if ((m_flags & PrimUpdateFlags.CancelKill) != 0) { - if(m_flags.HasFlag(PrimUpdateFlags.UpdateProbe)) + if ((m_flags & PrimUpdateFlags.UpdateProbe) != 0) m_flags = PrimUpdateFlags.UpdateProbe; else m_flags = PrimUpdateFlags.FullUpdatewithAnim; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index eb99ad11e1..96830be21f 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -4918,7 +4918,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PrimUpdateFlags updateFlags = update.Flags; - if (updateFlags.HasFlag(PrimUpdateFlags.Kill)) + if ((updateFlags & PrimUpdateFlags.Kill) != 0) { m_killRecord.Add(update.Entity.LocalId); maxUpdatesBytes -= 30; @@ -4932,7 +4932,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { SceneObjectPart part = (SceneObjectPart)update.Entity; SceneObjectGroup grp = part.ParentGroup; - if (grp.inTransit && !update.Flags.HasFlag(PrimUpdateFlags.SendInTransit)) + if (grp.inTransit && ((update.Flags & PrimUpdateFlags.SendInTransit) == 0)) continue; if (grp.IsDeleted) @@ -5013,7 +5013,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (dpos > maxview * maxview) continue; - if (!viewerCache || !updateFlags.HasFlag(PrimUpdateFlags.UpdateProbe)) + if (!viewerCache || ((updateFlags & PrimUpdateFlags.UpdateProbe) == 0)) { GroupsNeedFullUpdate.Add(grp); continue; @@ -5021,7 +5021,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - if (updateFlags.HasFlag(PrimUpdateFlags.UpdateProbe)) + if ((updateFlags & PrimUpdateFlags.UpdateProbe) != 0) { if (objectUpdateProbes == null) { @@ -5033,7 +5033,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP continue; } - if (updateFlags.HasFlag(PrimUpdateFlags.Animations)) + if ((updateFlags & PrimUpdateFlags.Animations) != 0) { if (m_SupportObjectAnimations && part.Animations != null) {