diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
commit | 94cb4b486a7c72841ccbcec403fc7b8c95c1249a (patch) | |
tree | 176ada6e4259c076ab6942b4c96538d868880281 /OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |
parent | * Adds a test for if the collision is at the bottom of the capsule on avatar.... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.zip opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.gz opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.bz2 opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index c790624..013a0ef 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -486,21 +486,21 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
486 | } | 486 | } |
487 | protected bool IsFriendWithPerms(UUID user,UUID objectOwner) | 487 | protected bool IsFriendWithPerms(UUID user,UUID objectOwner) |
488 | { | 488 | { |
489 | 489 | ||
490 | if (user == UUID.Zero) | 490 | if (user == UUID.Zero) |
491 | return false; | 491 | return false; |
492 | 492 | ||
493 | if (m_friendsModule == null) | 493 | if (m_friendsModule == null) |
494 | return false; | 494 | return false; |
495 | 495 | ||
496 | List<FriendListItem> profile = m_friendsModule.GetUserFriends(user); | 496 | List<FriendListItem> profile = m_friendsModule.GetUserFriends(user); |
497 | 497 | ||
498 | foreach (FriendListItem item in profile) | 498 | foreach (FriendListItem item in profile) |
499 | { | 499 | { |
500 | if(item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0) | 500 | if (item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0) |
501 | return true; | 501 | return true; |
502 | } | 502 | } |
503 | return false; | 503 | return false; |
504 | } | 504 | } |
505 | 505 | ||
506 | protected bool IsEstateManager(UUID user) | 506 | protected bool IsEstateManager(UUID user) |