aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorKitto Flora2010-04-05 15:27:13 -0400
committerKitto Flora2010-04-05 15:27:13 -0400
commit9b9e2a8c71e3ebaaf7b0a6c20ea7397198b241f7 (patch)
treeb23030439893b1c0c982ef3e074d861bc30b5334 /OpenSim/Region/CoreModules/World
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
downloadopensim-SC-9b9e2a8c71e3ebaaf7b0a6c20ea7397198b241f7.zip
opensim-SC-9b9e2a8c71e3ebaaf7b0a6c20ea7397198b241f7.tar.gz
opensim-SC-9b9e2a8c71e3ebaaf7b0a6c20ea7397198b241f7.tar.bz2
opensim-SC-9b9e2a8c71e3ebaaf7b0a6c20ea7397198b241f7.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
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 }