Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
commit
de94aa9bb5
|
@ -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))
|
||||||
|
|
Loading…
Reference in New Issue