diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs index 0fd221fafa..acb9ed7cbb 100644 --- a/OpenSim/Framework/ILandChannel.cs +++ b/OpenSim/Framework/ILandChannel.cs @@ -56,7 +56,7 @@ namespace OpenSim.Region.Framework.Interfaces /// Value between 0 - 256 on the y axis of the point /// Land object at the point supplied ILandObject GetLandObject(float x, float y); - ILandObject GetLandObjectClipedXY(float x, float y); + ILandObject GetLandObjectClippedXY(float x, float y); /// /// Get the parcel at the specified point /// diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index c1d6ec16dc..a10e20e1d2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -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; diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs index f993cb416d..a2c42f6629 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs @@ -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 AllParcels() diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index b33c187212..45e234f81d 100755 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -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 diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 31f326ddba..2d15e0a530 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.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) diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs index 5cd7c12063..38a4a2a476 100644 --- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs +++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs @@ -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(); }