From d0be98bacb8abc0ec18e0c1364a83481112f883c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 8 Feb 2023 03:00:20 +0000 Subject: [PATCH] cosmetics --- OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 2 +- OpenSim/Services/HypergridService/HGFriendsService.cs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index 2535355287..3ccad99157 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs @@ -2068,7 +2068,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde } } h0 = rx * rx + ry * ry + 1.0f; - h0 = 1.0f / (float) Math.Sqrt(h0); + h0 = 1.0f / MathF.Sqrt(h0); return new Vector3(rx * h0, ry * h0, h0); } diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs index 6e2a926fc1..06440586e8 100644 --- a/OpenSim/Services/HypergridService/HGFriendsService.cs +++ b/OpenSim/Services/HypergridService/HGFriendsService.cs @@ -233,16 +233,15 @@ namespace OpenSim.Services.HypergridService // First, let's double check that the reported friends are, indeed, friends of that user // And let's check that the secret matches List usersToBeNotified = new List(); + string foreignUserIDToString = foreignUserID.ToString(); foreach (string uui in friends) { - UUID localUserID; - string secret = string.Empty, tmp = string.Empty; - if (Util.ParseUniversalUserIdentifier(uui, out localUserID, out tmp, out tmp, out tmp, out secret)) + if (Util.ParseUniversalUserIdentifier(uui, out UUID localUserID, out _, out _, out _, out string secret)) { FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID); foreach (FriendInfo finfo in friendInfos) { - if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret)) + if (finfo.Friend.StartsWith(foreignUserIDToString) && finfo.Friend.EndsWith(secret)) { // great! usersToBeNotified.Add(localUserID.ToString());