ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix permissions checks on some crossings

Browse Source
This commit is contained in:
UbitUmarov
2020-09-01 16:30:07 +01:00
parent a1239d2706
commit 323c0673c2
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/WebUtil.cs
View File

@@ -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();
}
}

13
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -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)