From 019b34ea390998f4d51c0cc6d05f79b37aa558eb Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 28 Apr 2017 23:05:14 +0100 Subject: [PATCH] BuySell: bug fix, use all object permitions for sold item, and not the operation rights one --- .../World/Objects/BuySell/BuySellModule.cs | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index 90d65c7101..f90285df51 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs @@ -205,15 +205,20 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell item.AssetType = asset.Type; item.InvType = (int)InventoryType.Object; item.Folder = categoryID; - - uint nextPerms=(perms & 7) << 13; - if ((nextPerms & (uint)PermissionMask.Copy) == 0) - perms &= ~(uint)PermissionMask.Copy; - if ((nextPerms & (uint)PermissionMask.Transfer) == 0) - perms &= ~(uint)PermissionMask.Transfer; - if ((nextPerms & (uint)PermissionMask.Modify) == 0) - perms &= ~(uint)PermissionMask.Modify; - + + perms = group.GetEffectivePermissions(false); + +// if((perms & (uint)PermissionMask.FoldedMask) != 0) + { + if ((perms & (uint)PermissionMask.FoldedCopy) == 0) + perms &= ~(uint)PermissionMask.Copy; + if ((perms & (uint)PermissionMask.FoldedTransfer) == 0) + perms &= ~(uint)PermissionMask.Transfer; + if ((perms & (uint)PermissionMask.FoldedModify) == 0) + perms &= ~(uint)PermissionMask.Modify; + if ((perms & (uint)PermissionMask.FoldedExport) == 0) + perms &= ~(uint)PermissionMask.Export; + } item.BasePermissions = perms & part.NextOwnerMask; item.CurrentPermissions = perms & part.NextOwnerMask; item.NextPermissions = part.NextOwnerMask;