dont assume that all zero folded perms are to ignore ( coerence with old

code in avn-current )
avinationmerge
UbitUmarov 2014-08-05 17:55:30 +01:00
parent 507a29d581
commit 6eca2475d4
1 changed files with 2 additions and 2 deletions

View File

@ -72,8 +72,8 @@ namespace OpenSim.Framework
/// <param name="mainPerms">The permissions variable to modify.</param> /// <param name="mainPerms">The permissions variable to modify.</param>
public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms) public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms)
{ {
if ((foldedPerms & 7) == 0) // if ((foldedPerms & 7) == 0)
return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded // return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded
if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0) if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0)
mainPerms &= ~(uint)PermissionMask.Copy; mainPerms &= ~(uint)PermissionMask.Copy;