aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
diff options
context:
space:
mode:
authorMelanie2011-01-27 20:54:02 +0000
committerMelanie2011-01-27 20:54:02 +0000
commit34358165418530cacc2e819dddf1a55c73acf446 (patch)
treeeee27e3789e1281ba9911c25d18e940f8805963e /OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
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 '')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index be5411a..98e5453 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -62,6 +62,11 @@ public class RegionCombinerLargeLandChannel : ILandChannel
62 { 62 {
63 return RootRegionLandChannel.AllParcels(); 63 return RootRegionLandChannel.AllParcels();
64 } 64 }
65
66 public void Clear(bool setupDefaultParcel)
67 {
68 RootRegionLandChannel.Clear(setupDefaultParcel);
69 }
65 70
66 public ILandObject GetLandObject(int x, int y) 71 public ILandObject GetLandObject(int x, int y)
67 { 72 {