aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-13 17:50:02 +0000
committerMelanie Thielker2008-09-13 17:50:02 +0000
commit91e346358283e43644ef9a28483d9fac0b159e45 (patch)
treeaa81e60a0bc02c39b16b803e015d170849e4328d /OpenSim/Region/Environment
parentFix a typo in the DataSnapshot module (diff)
downloadopensim-SC_OLD-91e346358283e43644ef9a28483d9fac0b159e45.zip
opensim-SC_OLD-91e346358283e43644ef9a28483d9fac0b159e45.tar.gz
opensim-SC_OLD-91e346358283e43644ef9a28483d9fac0b159e45.tar.bz2
opensim-SC_OLD-91e346358283e43644ef9a28483d9fac0b159e45.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Interfaces/ILandChannel.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs5
3 files changed, 16 insertions, 0 deletions
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
36 { 36 {
37 37
38 List<ILandObject> ParcelsNearPoint(Vector3 position); 38 List<ILandObject> ParcelsNearPoint(Vector3 position);
39 List<ILandObject> AllParcels();
39 ILandObject GetLandObject(int x, int y); 40 ILandObject GetLandObject(int x, int y);
40 ILandObject GetLandObject(float x, float y); 41 ILandObject GetLandObject(float x, float y);
41 bool IsLandPrimCountTainted(); 42 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
105 return obj; 105 return obj;
106 } 106 }
107 107
108 public List<ILandObject> AllParcels()
109 {
110 if (m_landManagementModule != null)
111 {
112 return m_landManagementModule.AllParcels();
113 }
114
115 return new List<ILandObject>();
116 }
117
108 public List<ILandObject> ParcelsNearPoint(Vector3 position) 118 public List<ILandObject> ParcelsNearPoint(Vector3 position)
109 { 119 {
110 if (m_landManagementModule != null) 120 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
175 AddLandObject(fullSimParcel); 175 AddLandObject(fullSimParcel);
176 } 176 }
177 177
178 public List<ILandObject> AllParcels()
179 {
180 return new List<ILandObject>(landList.Values);
181 }
182
178 public List<ILandObject> ParcelsNearPoint(Vector3 position) 183 public List<ILandObject> ParcelsNearPoint(Vector3 position)
179 { 184 {
180 List<ILandObject> parcelsNear = new List<ILandObject>(); 185 List<ILandObject> parcelsNear = new List<ILandObject>();