Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

prioritization
Diva Canto 2009-10-03 08:46:25 -07:00
commit de94aa9bb5
1 changed files with 2 additions and 2 deletions

View File

@ -576,8 +576,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return objectOwnerMask; return objectOwnerMask;
} }
if ((objectOwnerMask & PermissionMask.Transfer != 0) && task.saleType != 0) if ((objectOwnerMask & (uint)PermissionMask.Transfer) != 0 && task.ObjectSaleType != 0)
objectEveryoneMask |= ObjectFlags.ObjectTransfer; objectEveryoneMask |= (uint)PrimFlags.ObjectTransfer;
// Group permissions // Group permissions
if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0)) if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0))