OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 commit
prebuild-update
Melanie 2010-07-14 14:59:34 +01:00
parent bec1d7cc36
commit 33aa7ba7dc
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -276,7 +276,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (UUID.Zero == transactionID) if (UUID.Zero == transactionID)
{ {
item.Name = itemUpd.Name; item.Name = itemUpd.Name;
item.Description = itemUpd.Description; item.Description = itemUpd.Description;
item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions; item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
@ -450,18 +449,12 @@ namespace OpenSim.Region.Framework.Scenes
(uint)PermissionMask.Modify) != 0 ? (uint)PermissionMask.Modify) != 0 ?
true : false; true : false;
bool isRootCopy = (item.CurrentPermissions &
(uint)PermissionMask.Copy) != 0 ?
true : false;
// Mask the owner perms to the folded perms // Mask the owner perms to the folded perms
ownerPerms &= foldedPerms; ownerPerms &= foldedPerms;
// If the root was mod, let the mask reflect that // If the root was mod, let the mask reflect that
if (isRootMod) if (isRootMod)
ownerPerms |= (uint)PermissionMask.Modify; ownerPerms |= (uint)PermissionMask.Modify;
if (isRootCopy)
ownerPerms |= (uint)PermissionMask.Copy;
} }
// These will be applied to the root prim at next rez. // These will be applied to the root prim at next rez.