diff options
| author | Melanie | 2009-11-05 16:46:39 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-05 16:46:39 +0000 |
| commit | b098572525a73fce0743087a272eac84336c4867 (patch) | |
| tree | 010323a53c3d515f096d0fd1d1a921e2fee73739 /OpenSim | |
| parent | Patch by revolution, thank you. Mantis #1789 . Implement friends permissions. (diff) | |
| download | opensim-SC_OLD-b098572525a73fce0743087a272eac84336c4867.zip opensim-SC_OLD-b098572525a73fce0743087a272eac84336c4867.tar.gz opensim-SC_OLD-b098572525a73fce0743087a272eac84336c4867.tar.bz2 opensim-SC_OLD-b098572525a73fce0743087a272eac84336c4867.tar.xz | |
Remove a spammy debug message from friends list check in the perms module.
Replace the integer compares with proper bitflags checking from libOMV.
Friends rights are now functional.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index effe1f0..f7675f4 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -484,26 +484,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 484 | List<FriendListItem> profile = m_scene.CommsManager.GetUserFriendList(user); | 484 | List<FriendListItem> profile = m_scene.CommsManager.GetUserFriendList(user); |
| 485 | foreach (FriendListItem item in profile) | 485 | foreach (FriendListItem item in profile) |
| 486 | { | 486 | { |
| 487 | m_log.Warn("IsFriendWithPerms called" + item.FriendPerms.ToString()); | 487 | if(item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0) |
| 488 | if(item.Friend == objectOwner) | 488 | return true; |
| 489 | { | ||
| 490 | // if (item.FriendPerms == 3) | ||
| 491 | // { | ||
| 492 | // return true; | ||
| 493 | // } | ||
| 494 | // if (item.FriendPerms == 4) | ||
| 495 | // { | ||
| 496 | // return true; | ||
| 497 | // } | ||
| 498 | // if (item.FriendPerms == 5) | ||
| 499 | // { | ||
| 500 | // return true; | ||
| 501 | // } | ||
| 502 | // if (item.FriendPerms == 7) | ||
| 503 | // { | ||
| 504 | // return true; | ||
| 505 | // } | ||
| 506 | } | ||
| 507 | } | 489 | } |
| 508 | return false; | 490 | return false; |
| 509 | } | 491 | } |