From 323c0673c2aa435e73ec52006abc6a2dc5b3b1e6 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 1 Sep 2020 16:30:07 +0100 Subject: [PATCH] fix permissions checks on some crossings --- OpenSim/Framework/WebUtil.cs | 3 +-- .../World/Permissions/PermissionsModule.cs | 13 ++----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index d6170760a2..b49396c6dc 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs @@ -1114,8 +1114,7 @@ namespace OpenSim.Framework { if (resp.ContentLength != 0) { - using (Stream respStream = resp.GetResponseStream()) - using (StreamReader reader = new StreamReader(respStream)) + using (StreamReader reader = new StreamReader(resp.GetResponseStream())) respstring = reader.ReadToEnd(); } } diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 73b9be8a36..31f326ddba 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -1874,7 +1874,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions return false; Vector3 pos = sog.AbsolutePosition; - ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); + ILandObject parcel = m_scene.LandChannel.GetLandObjectClipedXY(pos.X, pos.Y); if (parcel == null) return false; @@ -2080,16 +2080,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions parcel = m_scene.LandChannel.GetLandObject(id); else { - if (X < 0) - X = 0; - else if (X > ((int)m_scene.RegionInfo.RegionSizeX - 1)) - X = ((int)m_scene.RegionInfo.RegionSizeX - 1); - if (Y < 0) - Y = 0; - else if (Y > ((int)m_scene.RegionInfo.RegionSizeY - 1)) - Y = ((int)m_scene.RegionInfo.RegionSizeY - 1); - - parcel = m_scene.LandChannel.GetLandObject(X, Y); + parcel = m_scene.LandChannel.GetLandObjectClipedXY(X, Y); } if (parcel == null)