From 91e346358283e43644ef9a28483d9fac0b159e45 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 13 Sep 2008 17:50:02 +0000 Subject: Remove the cruft of accessing a private member of another module's class from DataSnapshot and replace it with a best practices approach, making it much less dependent on the land module's internal structure and types. --- OpenSim/Region/Environment/Interfaces/ILandChannel.cs | 1 + OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs | 10 ++++++++++ .../Environment/Modules/World/Land/LandManagementModule.cs | 5 +++++ 3 files changed, 16 insertions(+) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs index 4a74949..98998f7 100644 --- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs +++ b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs @@ -36,6 +36,7 @@ namespace OpenSim.Region.Environment.Interfaces { List ParcelsNearPoint(Vector3 position); + List AllParcels(); ILandObject GetLandObject(int x, int y); ILandObject GetLandObject(float x, float y); bool IsLandPrimCountTainted(); diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs index 1e1291a..8747bd4 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs @@ -105,6 +105,16 @@ namespace OpenSim.Region.Environment.Modules.World.Land return obj; } + public List AllParcels() + { + if (m_landManagementModule != null) + { + return m_landManagementModule.AllParcels(); + } + + return new List(); + } + public List ParcelsNearPoint(Vector3 position) { if (m_landManagementModule != null) diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index f4ba9a3..bf51edb 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs @@ -175,6 +175,11 @@ namespace OpenSim.Region.Environment.Modules.World.Land AddLandObject(fullSimParcel); } + public List AllParcels() + { + return new List(landList.Values); + } + public List ParcelsNearPoint(Vector3 position) { List parcelsNear = new List(); -- cgit v1.1