mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 18:55:58 +08:00
mantis 9158: allow it on prim inv to non-mod prim inventory if same owner and allowdrop was set on target
This commit is contained in:
@@ -2336,9 +2336,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
||||
return false;
|
||||
}
|
||||
|
||||
bool notSameOwner = srcsog.OwnerID.NotEqual(destsog.OwnerID);
|
||||
|
||||
if(notSameOwner)
|
||||
if(srcsog.OwnerID.NotEqual(destsog.OwnerID))
|
||||
{
|
||||
if((itperms & (uint)PermissionMask.Transfer) == 0)
|
||||
return false;
|
||||
@@ -2350,7 +2348,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
||||
}
|
||||
else
|
||||
{
|
||||
if((destsogEffectiveOwnerPerms & (uint)PermissionMask.Modify) == 0)
|
||||
if((destsogEffectiveOwnerPerms & (uint)PermissionMask.Modify) == 0 &&
|
||||
(destsog.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user