lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ok it is GetLandObjectClippedXY

Browse Source
This commit is contained in:
UbitUmarov
2020-09-01 21:22:06 +01:00
parent eae2f87cae
commit c8cb8a376b
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/ILandChannel.cs
View File

@@ -56,7 +56,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="y">Value between 0 - 256 on the y axis of the point</param>
/// <returns>Land object at the point supplied</returns>
ILandObject GetLandObject(float x, float y);
ILandObject GetLandObjectClipedXY(float x, float y);
ILandObject GetLandObjectClippedXY(float x, float y);
/// <summary>
/// Get the parcel at the specified point
/// </summary>

2
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@@ -1749,7 +1749,7 @@ namespace OpenSim.Region.ClientStack.Linden
UUID parcelID = tmp.AsUUID();
if (Util.ParseFakeParcelID(parcelID, out ulong regionHandle, out uint x, out uint y) && regionHandle == myHandler)
{
ILandObject land = m_Scene.LandChannel.GetLandObjectClipedXY(x, y);
ILandObject land = m_Scene.LandChannel.GetLandObjectClippedXY(x, y);
if (land != null)
landdata = land.LandData;
land = null;

4
OpenSim/Region/CoreModules/World/Land/LandChannel.cs
View File

@@ -126,9 +126,9 @@ namespace OpenSim.Region.CoreModules.World.Land
return m_landManagementModule != null ? m_landManagementModule.GetLandObject(x, y) : null;
}
public ILandObject GetLandObjectClipedXY(float x, float y)
public ILandObject GetLandObjectClippedXY(float x, float y)
{
return m_landManagementModule != null ? m_landManagementModule.GetLandObjectClipedXY(x, y) : null;
return m_landManagementModule != null ? m_landManagementModule.GetLandObjectClippedXY(x, y) : null;
}
public List<ILandObject> AllParcels()

10
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -944,7 +944,7 @@ namespace OpenSim.Region.CoreModules.World.Land
}
if(Util.ParseFakeParcelID(fakeID, out ulong rhandle, out uint x, out uint y) && rhandle == m_regionHandler)
{
return GetLandObjectClipedXY(x, y);
return GetLandObjectClippedXY(x, y);
}
return null;
}
@@ -979,7 +979,7 @@ namespace OpenSim.Region.CoreModules.World.Land
// if x,y is off region this will return the parcel at cliped x,y
// as did code it replaces
public ILandObject GetLandObjectClipedXY(float x, float y)
public ILandObject GetLandObjectClippedXY(float x, float y)
{
//do clip inline
int avx = (int)(Math.Round(x));
@@ -2141,7 +2141,7 @@ namespace OpenSim.Region.CoreModules.World.Land
ulong regionHandle = Util.BytesToUInt64Big((byte[])tmp);
if(regionHandle == myHandle)
{
ILandObject l = GetLandObjectClipedXY(x, y);
ILandObject l = GetLandObjectClippedXY(x, y);
if (l != null)
parcelID = l.LandData.FakeID;
else
@@ -2157,7 +2157,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (info.RegionHandle == myHandle)
{
ILandObject l = GetLandObjectClipedXY(x, y);
ILandObject l = GetLandObjectClippedXY(x, y);
if (l != null)
parcelID = l.LandData.FakeID;
else
@@ -2184,7 +2184,7 @@ namespace OpenSim.Region.CoreModules.World.Land
UUID regionID = tmp.AsUUID();
if (regionID == m_scene.RegionInfo.RegionID)
{
ILandObject l = GetLandObjectClipedXY(x, y);
ILandObject l = GetLandObjectClippedXY(x, y);
if (l != null)
parcelID = l.LandData.FakeID;
else

4
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.GetLandObjectClipedXY(pos.X, pos.Y);
ILandObject parcel = m_scene.LandChannel.GetLandObjectClippedXY(pos.X, pos.Y);
if (parcel == null)
return false;
@@ -2080,7 +2080,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
parcel = m_scene.LandChannel.GetLandObject(id);
else
{
parcel = m_scene.LandChannel.GetLandObjectClipedXY(X, Y);
parcel = m_scene.LandChannel.GetLandObjectClippedXY(X, Y);
}
if (parcel == null)

2
OpenSim/Tests/Common/Mock/TestLandChannel.cs
View File

@@ -93,7 +93,7 @@ namespace OpenSim.Tests.Common
return GetNoLand();
}
public ILandObject GetLandObjectClipedXY(float x, float y)
public ILandObject GetLandObjectClippedXY(float x, float y)
{
return GetNoLand();
}