From b098572525a73fce0743087a272eac84336c4867 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 5 Nov 2009 16:46:39 +0000 Subject: [PATCH] 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. --- .../World/Permissions/PermissionsModule.cs | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index effe1f0967..f7675f4eab 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 List profile = m_scene.CommsManager.GetUserFriendList(user); foreach (FriendListItem item in profile) { - m_log.Warn("IsFriendWithPerms called" + item.FriendPerms.ToString()); - if(item.Friend == objectOwner) - { -// if (item.FriendPerms == 3) -// { -// return true; -// } -// if (item.FriendPerms == 4) -// { -// return true; -// } -// if (item.FriendPerms == 5) -// { -// return true; -// } -// if (item.FriendPerms == 7) -// { -// return true; -// } - } + if(item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0) + return true; } return false; }