aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorUbitUmarov2013-01-03 14:27:21 +0000
committerUbitUmarov2013-01-03 14:27:21 +0000
commita285ff7e6942f9b55b18b00a765a5b4491fba011 (patch)
tree51f3209e40fa183375e1fa76580a6d8d7033537f /OpenSim/Region/CoreModules/World
parentmake ResetMoveToTarget cancel any 'force' waiting to be applied to avatar (diff)
downloadopensim-SC_OLD-a285ff7e6942f9b55b18b00a765a5b4491fba011.zip
opensim-SC_OLD-a285ff7e6942f9b55b18b00a765a5b4491fba011.tar.gz
opensim-SC_OLD-a285ff7e6942f9b55b18b00a765a5b4491fba011.tar.bz2
opensim-SC_OLD-a285ff7e6942f9b55b18b00a765a5b4491fba011.tar.xz
check land permitions on sit target for unscripted sits
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index d5b2adb..fdac418 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -442,6 +442,19 @@ namespace OpenSim.Region.CoreModules.World.Land
442 return false; 442 return false;
443 } 443 }
444 444
445 public bool CanBeOnThisLand(UUID avatar, float posHeight)
446 {
447 if (posHeight < LandChannel.BAN_LINE_SAFETY_HIEGHT && IsBannedFromLand(avatar))
448 {
449 return false;
450 }
451 else if (IsRestrictedFromLand(avatar))
452 {
453 return false;
454 }
455 return true;
456 }
457
445 public bool HasGroupAccess(UUID avatar) 458 public bool HasGroupAccess(UUID avatar)
446 { 459 {
447 if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup) 460 if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)