diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 5d47d038e9..fd38deeb17 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -8434,7 +8434,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; MoneyTransferRequestPacket money = (MoneyTransferRequestPacket)Pack; // validate the agent owns the agentID and sessionID - if (money.MoneyData.SourceID == m_agentId && money.AgentData.AgentID.Equals(m_agentId) && + if (money.MoneyData.SourceID.Equals(m_agentId) && money.AgentData.AgentID.Equals(m_agentId) && money.AgentData.SessionID.Equals(m_sessionId)) { OnMoneyTransferRequest?.Invoke(money.MoneyData.SourceID, money.MoneyData.DestID, @@ -11326,7 +11326,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleGodKickUser(Packet Pack) { GodKickUserPacket gkupack = (GodKickUserPacket)Pack; - if (gkupack.UserInfo.GodSessionID.NotEqual(m_sessionId) || gkupack.UserInfo.GodID != m_agentId) + if (gkupack.UserInfo.GodSessionID.NotEqual(m_sessionId) || gkupack.UserInfo.GodID.NotEqual(m_agentId)) return; OnGodKickUser?.Invoke(gkupack.UserInfo.GodID, gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason); diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPZeroEncoder.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPZeroEncoder.cs index 7315a7b7db..6f9718c3d4 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPZeroEncoder.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPZeroEncoder.cs @@ -273,7 +273,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void AddVector3(Vector3 v) { - if (v == Vector3.Zero) + if (v.IsZero()) AddZeros(12); else { diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d756ee30fb..bf605770ef 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3498,7 +3498,7 @@ namespace OpenSim.Region.Framework.Scenes offset = offset * part.RotationOffset; offset += part.OffsetPosition; - if (cameraAtOffset == Vector3.Zero && cameraEyeOffset == Vector3.Zero) + if (cameraAtOffset.IsZero() && cameraEyeOffset.IsZero()) { cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset(); cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset(); @@ -3645,7 +3645,7 @@ namespace OpenSim.Region.Framework.Scenes offset = offset * part.RotationOffset; offset += part.OffsetPosition; - if (cameraAtOffset == Vector3.Zero && cameraEyeOffset == Vector3.Zero) + if (cameraAtOffset.IsZero() && cameraEyeOffset.IsZero()) { cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset(); cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset(); @@ -6271,7 +6271,7 @@ namespace OpenSim.Region.Framework.Scenes return true; Vector3 landLocation = land.LandData.UserLocation; - if(landLocation == Vector3.Zero) + if(landLocation.IsZero()) return true; if (currDistanceSQ < Vector3.DistanceSquared(landLocation, pos)) diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs index 26f3ffe35d..787d83fda4 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs @@ -3660,7 +3660,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde (m_PIDTarget.Z - lpos.Z) ); - if (_target_velocity.ApproxEquals(Vector3.Zero, 0.02f)) + if (_target_velocity.ApproxZero(0.02f)) { SafeNativeMethods.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z); SafeNativeMethods.BodySetLinearVel(Body, 0, 0, 0); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 10456ca61b..24e254e89f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -8020,7 +8020,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.SetCameraEyeOffset(offset); - if (m_host.ParentGroup.RootPart.GetCameraEyeOffset() == Vector3.Zero) + if (m_host.ParentGroup.RootPart.GetCameraEyeOffset().IsZero()) m_host.ParentGroup.RootPart.SetCameraEyeOffset(offset); } @@ -8028,7 +8028,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.SetCameraAtOffset(offset); - if (m_host.ParentGroup.RootPart.GetCameraAtOffset() == Vector3.Zero) + if (m_host.ParentGroup.RootPart.GetCameraAtOffset().IsZero()) m_host.ParentGroup.RootPart.SetCameraAtOffset(offset); } @@ -15506,7 +15506,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api Vector3 v = t.p3 - t.p1; Vector3 n = Vector3.Cross(u, v); - if (n == Vector3.Zero) + if (n.IsZero()) continue; Vector3 w0 = rayStart - t.p1; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c16b6dc37e..974351ab1c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -3276,11 +3276,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!module.CheckPermissions(npcId, m_host.OwnerID)) return; - UUID ImageID = new UUID(); - - ImageID = ScriptUtils.GetAssetIdFromItemName(m_host, image, (int)AssetType.Texture); - - if (ImageID == null || ImageID.IsZero()) + UUID ImageID = ScriptUtils.GetAssetIdFromItemName(m_host, image, (int)AssetType.Texture); + if (ImageID.IsZero()) { if (!UUID.TryParse(image, out ImageID)) return; diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index a623144bd5..c6fcf89445 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs @@ -228,7 +228,7 @@ namespace OpenSim.Region.ScriptEngine.Shared Group = part.GroupID; Name = part.Name; Owner = part.OwnerID; - if (part.Velocity == Vector3.Zero) + if (part.Velocity.IsZero()) Type = PASSIVE; else Type = ACTIVE; @@ -289,7 +289,7 @@ namespace OpenSim.Region.ScriptEngine.Shared Rotation = new LSL_Types.Quaternion(obj.rotQuat); Velocity = new LSL_Types.Vector3(obj.velVector); LinkNum = obj.linkNumber; - if(obj.velVector == Vector3.Zero) + if(obj.velVector.IsZero()) Type = 4; else Type = 2; diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index 82dd1b9b91..f49190876e 100755 Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index 384a521064..c872a29ccc 100755 Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 013deec793..96fa2966d2 100755 Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index fbc0616844..f3f3e5c737 100755 Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ