From fedd1a93d28c86459e66a05f8ce189498b7ab354 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 29 Apr 2017 23:09:32 +0100
Subject: buysell: fix permissions masks hierachy

---
 .../CoreModules/World/Objects/BuySell/BuySellModule.cs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Objects')

diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index af53aa3..ca392b8 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -208,18 +208,20 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 
                 perms = group.GetEffectivePermissions(false);
                
-                PermissionsUtil.ApplyFoldedPermissions(perms, ref perms);
+                PermissionsUtil.ApplyNoModFoldedPermissions(perms, ref perms);
 
                 perms &=  part.NextOwnerMask;
 
-                item.BasePermissions = PermissionsUtil.FixAndFoldPermissions(perms);
+                perms = PermissionsUtil.FixAndFoldPermissions(perms);
 
-                item.CurrentPermissions = item.BasePermissions;
-                item.NextPermissions = part.NextOwnerMask;
-                item.EveryOnePermissions = part.EveryoneMask &
-                                           part.NextOwnerMask;
-                item.GroupPermissions = part.GroupMask &
-                                           part.NextOwnerMask;
+                item.BasePermissions = perms;
+                item.CurrentPermissions = perms;
+
+                perms &= part.NextOwnerMask;
+                item.NextPermissions = perms;
+
+                item.EveryOnePermissions = part.EveryoneMask & perms;
+                item.GroupPermissions = part.GroupMask & perms;
                 item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
                 item.CreationDate = Util.UnixTimeSinceEpoch();
 
-- 
cgit v1.1