From c1115e4c2e8a35fee3287add748881f3718deba5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 14 Mar 2013 22:56:26 +0000
Subject: Add ILandChannel.GetLandObject(Vector3 position) as this is a very
common input to GetLandObject()
This conforms to the existing ILandChannel.ParcelsNearPoint() method
---
OpenSim/Framework/ILandChannel.cs | 7 +++++++
OpenSim/Region/CoreModules/World/Land/LandChannel.cs | 5 +++++
.../Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | 5 +++++
OpenSim/Tests/Common/Mock/TestLandChannel.cs | 5 +++++
4 files changed, 22 insertions(+)
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index 869d4c8..c46c03c 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -56,6 +56,13 @@ namespace OpenSim.Region.Framework.Interfaces
ILandObject GetLandObject(float x, float y);
///
+ /// Get the parcel at the specified point
+ ///
+ /// Vector where x and y components are between 0 and 256. z component is ignored.
+ /// Land object at the point supplied
+ ILandObject GetLandObject(Vector3 position);
+
+ ///
/// Get the parcels near the specified point
///
///
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 7fc358d..73c592d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -95,6 +95,11 @@ namespace OpenSim.Region.CoreModules.World.Land
return null;
}
+ public ILandObject GetLandObject(Vector3 position)
+ {
+ return GetLandObject(position.X, position.Y);
+ }
+
public ILandObject GetLandObject(int x, int y)
{
if (m_landManagementModule != null)
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index a133e51..b4abc1d 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -68,6 +68,11 @@ public class RegionCombinerLargeLandChannel : ILandChannel
RootRegionLandChannel.Clear(setupDefaultParcel);
}
+ public ILandObject GetLandObject(Vector3 position)
+ {
+ return GetLandObject(position.X, position.Y);
+ }
+
public ILandObject GetLandObject(int x, int y)
{
//m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y);
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 4b4d52d..3115035 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -81,6 +81,11 @@ namespace OpenSim.Tests.Common.Mock
return obj;
}
+ public ILandObject GetLandObject(Vector3 position)
+ {
+ return GetLandObject(position.X, position.Y);
+ }
+
public ILandObject GetLandObject(int x, int y)
{
return GetNoLand();
--
cgit v1.1