diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 6a9e12c890..9f41f5b8fb 100755 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -2117,7 +2117,7 @@ namespace OpenSim.Region.CoreModules.World.Land { // if you do a "About Landmark" on a landmark a second time, the viewer sends the // region_handle it got earlier via RegionHandleRequest - ulong regionHandle = Util.BytesToUInt64Big((byte[])tmp); + ulong regionHandle = tmp.AsULong(); if(regionHandle == myHandle) { ILandObject l = GetLandObjectClippedXY(x, y); diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index 02469acfa2..e524724228 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -75,8 +75,8 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing private bool doConvexPrims = true; private bool doConvexSculpts = true; - private readonly Dictionary m_uniqueMeshes = new(); - private readonly Dictionary m_uniqueReleasedMeshes = new (); + private readonly Dictionary m_uniqueMeshes = []; + private readonly Dictionary m_uniqueReleasedMeshes = []; #region INonSharedRegionModule public string Name @@ -173,7 +173,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing /// Size of entire object /// /// - private unsafe void AddSubMesh(OSDMap subMeshData, List coords, List faces) + private unsafe void AddSubMesh(OSDMap subMeshData, List coords, List faces) { // Console.WriteLine("subMeshMap for {0} - {1}", primName, Util.GetFormattedXml((OSD)subMeshMap)); @@ -209,7 +209,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing int faceIndexOffset = coords.Count; fixed (byte* ptrstart = posBytes) - { + { byte* end = ptrstart + posBytes.Length; byte* ptr = ptrstart; while (ptr < end) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 84afeb9ba6..28bda1447c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs @@ -96,7 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins private const int SCRIPTED = 8; private readonly float maximumRange = 96.0f; - private readonly int maximumToReturn = 16; + private readonly int maximumToReturn = 32; // // Sensed entity diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 2bfbcda7b4..39140faee8 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs @@ -43,6 +43,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; using OpenSim.Framework; using OpenSim.Framework.Servers.HttpServer; using OpenMetaverse; +using OpenMetaverse.StructuredData; namespace OpenSim.Server.Handlers.Hypergrid { @@ -80,13 +81,13 @@ namespace OpenSim.Server.Handlers.Hypergrid try { - Dictionary request = - ServerUtils.ParseQueryString(body); + Dictionary request = ServerUtils.ParseQueryString(body); - if (!request.ContainsKey("METHOD")) + object tmpObj; + if (!request.TryGetValue("METHOD", out tmpObj)) return FailureResult(); - string method = request["METHOD"].ToString(); + string method = tmpObj.ToString(); switch (method) { @@ -140,19 +141,14 @@ namespace OpenSim.Server.Handlers.Hypergrid if (!VerifyServiceKey(request)) return FailureResult(); - UUID principalID = UUID.Zero; - if (request.ContainsKey("PRINCIPALID")) - UUID.TryParse(request["PRINCIPALID"].ToString(), out principalID); - else + object tmpObj; + if (!request.TryGetValue("PRINCIPALID", out tmpObj) || !UUID.TryParse(tmpObj.ToString(), out UUID principalID)) { m_log.WarnFormat("[HGFRIENDS HANDLER]: no principalID in request to get friend perms"); return FailureResult(); } - UUID friendID = UUID.Zero; - if (request.ContainsKey("FRIENDID")) - UUID.TryParse(request["FRIENDID"].ToString(), out friendID); - else + if (!request.TryGetValue("FRIENDID", out tmpObj) || !UUID.TryParse(tmpObj.ToString(), out UUID friendID)) { m_log.WarnFormat("[HGFRIENDS HANDLER]: no friendID in request to get friend perms"); return FailureResult(); @@ -181,14 +177,14 @@ namespace OpenSim.Server.Handlers.Hypergrid byte[] DeleteFriendship(Dictionary request) { - FriendInfo friend = new FriendInfo(request); - string secret = string.Empty; - if (request.ContainsKey("SECRET")) - secret = request["SECRET"].ToString(); + if (request.TryGetValue("SECRET", out object tmpObj) || tmpObj is null) + return BoolResult(false); + string secret = tmpObj.ToString(); if (secret.Length == 0) return BoolResult(false); + FriendInfo friend = new FriendInfo(request); bool success = m_TheService.DeleteFriendship(friend, secret); return BoolResult(success); @@ -196,27 +192,15 @@ namespace OpenSim.Server.Handlers.Hypergrid byte[] FriendshipOffered(Dictionary request) { - UUID fromID = UUID.Zero; - UUID toID = UUID.Zero; - string message = string.Empty; - string name = string.Empty; - - if (!request.ContainsKey("FromID") || !request.ContainsKey("ToID")) + if (!request.TryGetValue("FromID", out object FromIDobj) || !UUID.TryParse(FromIDobj.ToString(), out UUID fromID)) + return BoolResult(false); + if (!request.TryGetValue("ToID", out object ToIDobj) || !UUID.TryParse(ToIDobj.ToString(), out UUID toID)) return BoolResult(false); - if (!UUID.TryParse(request["ToID"].ToString(), out toID)) - return BoolResult(false); - - message = request["Message"].ToString(); - - if (!UUID.TryParse(request["FromID"].ToString(), out fromID)) - return BoolResult(false); - - if (request.ContainsKey("FromName")) - name = request["FromName"].ToString(); + string name = request.TryGetValue("FromName", out object FromNameobj) ? FromNameobj.ToString() : string.Empty; + string message = request.TryGetValue("Message", out object Messageobj) ? Messageobj.ToString() : string.Empty; bool success = m_TheService.FriendshipOffered(fromID, name, toID, message); - return BoolResult(success); } @@ -234,9 +218,10 @@ namespace OpenSim.Server.Handlers.Hypergrid byte[] StatusNotification(Dictionary request) { + object tmpObj; UUID principalID = UUID.Zero; - if (request.ContainsKey("userID")) - UUID.TryParse(request["userID"].ToString(), out principalID); + if (request.TryGetValue("userID", out tmpObj)) + UUID.TryParse(tmpObj.ToString(), out principalID); else { m_log.WarnFormat("[HGFRIENDS HANDLER]: no userID in request to notify"); @@ -244,8 +229,8 @@ namespace OpenSim.Server.Handlers.Hypergrid } bool online = true; - if (request.ContainsKey("online")) - Boolean.TryParse(request["online"].ToString(), out online); + if (request.TryGetValue("online", out tmpObj)) + bool.TryParse(tmpObj.ToString(), out online); else { m_log.WarnFormat("[HGFRIENDS HANDLER]: no online in request to notify"); @@ -266,7 +251,7 @@ namespace OpenSim.Server.Handlers.Hypergrid List onlineFriends = m_TheService.StatusNotification(friends, principalID, online); Dictionary result = new Dictionary(); - if ((onlineFriends == null) || ((onlineFriends != null) && (onlineFriends.Count == 0))) + if (onlineFriends == null || onlineFriends.Count == 0) result["RESULT"] = "NULL"; else { @@ -290,20 +275,14 @@ namespace OpenSim.Server.Handlers.Hypergrid private bool VerifyServiceKey(Dictionary request) { - if (!request.ContainsKey("KEY") || !request.ContainsKey("SESSIONID")) + if (!request.TryGetValue("KEY", out object KEYobj) || KEYobj is not string serviceKey || serviceKey.Length == 0 || + !request.TryGetValue("SESSIONID", out object SESSIONIDobj) || SESSIONIDobj is not string sessionStr) { m_log.WarnFormat("[HGFRIENDS HANDLER]: ignoring request without Key or SessionID"); return false; } - if (request["KEY"] == null || request["SESSIONID"] == null) - return false; - - string serviceKey = request["KEY"].ToString(); - string sessionStr = request["SESSIONID"].ToString(); - - UUID sessionID; - if (!UUID.TryParse(sessionStr, out sessionID) || serviceKey.Length == 0) + if (!UUID.TryParse(sessionStr, out UUID sessionID)) return false; if (!m_UserAgentService.VerifyAgent(sessionID, serviceKey)) @@ -325,8 +304,7 @@ namespace OpenSim.Server.Handlers.Hypergrid doc.AppendChild(xmlnode); - XmlElement rootElement = doc.CreateElement("", "ServerResponse", - ""); + XmlElement rootElement = doc.CreateElement("", "ServerResponse", ""); doc.AppendChild(rootElement); @@ -342,8 +320,7 @@ namespace OpenSim.Server.Handlers.Hypergrid { XmlDocument doc = new XmlDocument(); - XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration, - "", ""); + XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration, "", ""); doc.AppendChild(xmlnode); @@ -380,8 +357,7 @@ namespace OpenSim.Server.Handlers.Hypergrid doc.AppendChild(xmlnode); - XmlElement rootElement = doc.CreateElement("", "ServerResponse", - ""); + XmlElement rootElement = doc.CreateElement("", "ServerResponse", ""); doc.AppendChild(rootElement); @@ -407,8 +383,7 @@ namespace OpenSim.Server.Handlers.Hypergrid doc.AppendChild(xmlnode); - XmlElement rootElement = doc.CreateElement("", "ServerResponse", - ""); + XmlElement rootElement = doc.CreateElement("", "ServerResponse", ""); doc.AppendChild(rootElement);