diff options
author | Justin Clark-Casey (justincc) | 2011-01-27 18:48:48 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-01-27 18:48:48 +0000 |
commit | 5a26dc2743f176cc5f5fad0ae93aa8187a399f13 (patch) | |
tree | e48f513ed8ee8271c92930adbbeaf6c7fbd01798 /OpenSim/Region/RegionCombinerModule | |
parent | remove unused CreateBaseLand() (diff) | |
download | opensim-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/RegionCombinerModule')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs index be5411a..c2480b7 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() | ||
67 | { | ||
68 | RootRegionLandChannel.Clear(); | ||
69 | } | ||
65 | 70 | ||
66 | public ILandObject GetLandObject(int x, int y) | 71 | public ILandObject GetLandObject(int x, int y) |
67 | { | 72 | { |