From 8a56d44d9b922deacc1e20ec47ab40f049e8995b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 3 Sep 2024 23:55:32 +0100 Subject: [PATCH] mantis 9158: allow it on prim inv to non-mod prim inventory if same owner and allowdrop was set on target --- .../CoreModules/World/Permissions/PermissionsModule.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 726840380b..c9bb534f62 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -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; }