diff options
| author | Thomas Grimshaw | 2010-04-05 22:11:11 +0200 |
|---|---|---|
| committer | Thomas Grimshaw | 2010-04-05 22:11:11 +0200 |
| commit | 07b4889eab148efedb5ea554b2ed5eb4ca30752c (patch) | |
| tree | 1dca4c8b04e17e57772a999d55a38a1346eebd01 /OpenSim/Region/CoreModules | |
| parent | This commit adds some randomness to object persistence. It's a Work In Progre... (diff) | |
| parent | Fix some overlooked merge conflicts that got committed (diff) | |
| download | opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.zip opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.gz opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.bz2 opensim-SC-07b4889eab148efedb5ea554b2ed5eb4ca30752c.tar.xz | |
Merge branch 'master' of ssh://TOR/var/git/careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 6c9830c..8039558 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
| @@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 390 | { | 390 | { |
| 391 | if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT) | 391 | if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT) |
| 392 | { | 392 | { |
| 393 | if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID)) | 393 | if (parcelAvatarIsEntering.IsEitherBannedOrRestricted(avatar.UUID)) |
| 394 | { | 394 | { |
| 395 | MoveUserOutOfParcel(avatar); | 395 | MoveUserOutOfParcel(avatar); |
| 396 | } | 396 | } |