aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-01-27 20:54:02 +0000
committerMelanie2011-01-27 20:54:02 +0000
commit34358165418530cacc2e819dddf1a55c73acf446 (patch)
treeeee27e3789e1281ba9911c25d18e940f8805963e /OpenSim/Region/Framework
parentMake the estate setting "Allow direct teleport" override the constraint (diff)
parentWhen an oar is loaded, do not create a default parcel before loading the parc... (diff)
downloadopensim-SC-34358165418530cacc2e819dddf1a55c73acf446.zip
opensim-SC-34358165418530cacc2e819dddf1a55c73acf446.tar.gz
opensim-SC-34358165418530cacc2e819dddf1a55c73acf446.tar.bz2
opensim-SC-34358165418530cacc2e819dddf1a55c73acf446.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ILandChannel.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 20b8ab6..30bae16 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -69,6 +69,14 @@ 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 /// <param name="setupDefaultParcel">
76 /// If true, set up a default parcel covering the whole region owned by the estate owner.
77 /// </param>
78 void Clear(bool setupDefaultParcel);
79
72 bool IsLandPrimCountTainted(); 80 bool IsLandPrimCountTainted();
73 bool IsForcefulBansAllowed(); 81 bool IsForcefulBansAllowed();
74 void UpdateLandObject(int localID, LandData data); 82 void UpdateLandObject(int localID, LandData data);