diff options
| author | Melanie | 2011-04-06 09:22:55 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-06 09:22:55 +0100 |
| commit | 407c2b182303d3bc1214e71f407bddc28c671a55 (patch) | |
| tree | e9658864b8dcad3c2dced73e97b505941576de9b /OpenSim/Region/RegionCombinerModule | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Change some text to make the autoreturn mechanism more obvious, and align wit... (diff) | |
| download | opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.zip opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.gz opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.bz2 opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs index 98e5453..a133e51 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | |||
| @@ -130,11 +130,6 @@ public class RegionCombinerLargeLandChannel : ILandChannel | |||
| 130 | } | 130 | } |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | public bool IsLandPrimCountTainted() | ||
| 134 | { | ||
| 135 | return RootRegionLandChannel.IsLandPrimCountTainted(); | ||
| 136 | } | ||
| 137 | |||
| 138 | public bool IsForcefulBansAllowed() | 133 | public bool IsForcefulBansAllowed() |
| 139 | { | 134 | { |
| 140 | return RootRegionLandChannel.IsForcefulBansAllowed(); | 135 | return RootRegionLandChannel.IsForcefulBansAllowed(); |