aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs
diff options
context:
space:
mode:
authorMelanie2013-12-11 01:39:56 +0000
committerMelanie2013-12-11 01:39:56 +0000
commit5b73b9c4a85335ba837280688b903fef44be8f35 (patch)
treebd560ec720eb6fbf86b744522b2509071bc31a30 /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.zip
opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.gz
opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.bz2
opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.xz
Committing the Avination Scene Presence and related texture code
- Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-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 e55c9ed..e54c849 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -414,6 +414,19 @@ namespace OpenSim.Region.CoreModules.World.Land
414 return false; 414 return false;
415 } 415 }
416 416
417 public bool CanBeOnThisLand(UUID avatar, float posHeight)
418 {
419 if (posHeight < LandChannel.BAN_LINE_SAFETY_HIEGHT && IsBannedFromLand(avatar))
420 {
421 return false;
422 }
423 else if (IsRestrictedFromLand(avatar))
424 {
425 return false;
426 }
427 return true;
428 }
429
417 public bool HasGroupAccess(UUID avatar) 430 public bool HasGroupAccess(UUID avatar)
418 { 431 {
419 if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup) 432 if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)