Revert "More on mantis #4869. This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing."
Cuauses a permission escalation. do NOT USE the preceding commitprebuild-update
parent
bec1d7cc36
commit
33aa7ba7dc
|
@ -276,7 +276,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
if (UUID.Zero == transactionID)
|
||||
{
|
||||
|
||||
item.Name = itemUpd.Name;
|
||||
item.Description = itemUpd.Description;
|
||||
item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
|
||||
|
@ -450,18 +449,12 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
(uint)PermissionMask.Modify) != 0 ?
|
||||
true : false;
|
||||
|
||||
bool isRootCopy = (item.CurrentPermissions &
|
||||
(uint)PermissionMask.Copy) != 0 ?
|
||||
true : false;
|
||||
|
||||
// Mask the owner perms to the folded perms
|
||||
ownerPerms &= foldedPerms;
|
||||
|
||||
// If the root was mod, let the mask reflect that
|
||||
if (isRootMod)
|
||||
ownerPerms |= (uint)PermissionMask.Modify;
|
||||
if (isRootCopy)
|
||||
ownerPerms |= (uint)PermissionMask.Copy;
|
||||
}
|
||||
|
||||
// These will be applied to the root prim at next rez.
|
||||
|
|
Loading…
Reference in New Issue