aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-01-27 18:48:48 +0000
committerJustin Clark-Casey (justincc)2011-01-27 18:48:48 +0000
commit5a26dc2743f176cc5f5fad0ae93aa8187a399f13 (patch)
treee48f513ed8ee8271c92930adbbeaf6c7fbd01798 /OpenSim/Region/CoreModules/World/Land/LandChannel.cs
parentremove unused CreateBaseLand() (diff)
downloadopensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.zip
opensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.gz
opensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.bz2
opensim-SC_OLD-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.xz
Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
The --merge switch will still merge the old and new land parcelling.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandChannel.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandChannel.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 9e27ef0..2959eb4 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -116,6 +116,12 @@ namespace OpenSim.Region.CoreModules.World.Land
116 116
117 return new List<ILandObject>(); 117 return new List<ILandObject>();
118 } 118 }
119
120 public void Clear()
121 {
122 if (m_landManagementModule != null)
123 m_landManagementModule.Clear();
124 }
119 125
120 public List<ILandObject> ParcelsNearPoint(Vector3 position) 126 public List<ILandObject> ParcelsNearPoint(Vector3 position)
121 { 127 {