aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
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/Framework
parentremove unused CreateBaseLand() (diff)
downloadopensim-SC-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.zip
opensim-SC-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.gz
opensim-SC-5a26dc2743f176cc5f5fad0ae93aa8187a399f13.tar.bz2
opensim-SC-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/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ILandChannel.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 20b8ab6..17570c6 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -69,6 +69,11 @@ namespace OpenSim.Region.Framework.Interfaces
69 /// <returns></returns> 69 /// <returns></returns>
70 ILandObject GetLandObject(int localID); 70 ILandObject GetLandObject(int localID);
71 71
72 /// <summary>
73 /// Clear the land channel of all parcels.
74 /// </summary>
75 void Clear();
76
72 bool IsLandPrimCountTainted(); 77 bool IsLandPrimCountTainted();
73 bool IsForcefulBansAllowed(); 78 bool IsForcefulBansAllowed();
74 void UpdateLandObject(int localID, LandData data); 79 void UpdateLandObject(int localID, LandData data);