Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-04-06 09:22:55 +01:00
25 changed files with 514 additions and 279 deletions

View File

@@ -130,11 +130,6 @@ public class RegionCombinerLargeLandChannel : ILandChannel
}
}
public bool IsLandPrimCountTainted()
{
return RootRegionLandChannel.IsLandPrimCountTainted();
}
public bool IsForcefulBansAllowed()
{
return RootRegionLandChannel.IsForcefulBansAllowed();