diff options
| author | Melanie | 2010-04-05 18:10:49 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-05 18:10:49 +0100 |
| commit | f505c1d0a433f8720be6aab641d72883e1686136 (patch) | |
| tree | 87f0d141d4784b38ed12364ba8cb86169844a986 /OpenSim | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| parent | Fixed Ban and parcel exclusion. Need to fix the parcel chat too (diff) | |
| download | opensim-SC_OLD-f505c1d0a433f8720be6aab641d72883e1686136.zip opensim-SC_OLD-f505c1d0a433f8720be6aab641d72883e1686136.tar.gz opensim-SC_OLD-f505c1d0a433f8720be6aab641d72883e1686136.tar.bz2 opensim-SC_OLD-f505c1d0a433f8720be6aab641d72883e1686136.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim')
| -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 | } |