Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

avinationmerge
Melanie 2010-04-05 18:10:49 +01:00
commit f505c1d0a4
1 changed files with 1 additions and 1 deletions

View File

@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{ {
if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT) if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
{ {
if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID)) if (parcelAvatarIsEntering.IsEitherBannedOrRestricted(avatar.UUID))
{ {
MoveUserOutOfParcel(avatar); MoveUserOutOfParcel(avatar);
} }