From 04117d9f75ca278a921be9ce09c8c859f81cd428 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 29 Apr 2017 19:07:04 +0100
Subject:  recover PermissionsUtil.ApplyFoldedPermissions (well my version).
 its use easys code readability

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a6f6aa3..5e19a8a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1267,17 +1267,19 @@ namespace OpenSim.Region.Framework.Scenes
             // TODO: Fix this after the inventory fixer exists and has beenr run
             if ((part.OwnerID != destAgent) && Permissions.PropagatePermissions())
             {
-                agentItem.BasePermissions = taskItem.BasePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
+                agentItem.BasePermissions = taskItem.BasePermissions & taskItem.NextPermissions;
                 if (taskItem.InvType == (int)InventoryType.Object)
                 {
-                    if((taskItem.CurrentPermissions & (uint)PermissionMask.FoldedMask) != 0)
-                        agentItem.BasePermissions &=
-                            (((taskItem.CurrentPermissions & (uint)PermissionMask.FoldedMask ) << (int)PermissionMask.FoldingShift) |
-                            (taskItem.CurrentPermissions & (uint)PermissionMask.Move));
+                    uint perms = agentItem.BasePermissions;
+                    PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms );
+                    agentItem.BasePermissions = perms;
                 }
                 else
                     agentItem.BasePermissions &= taskItem.CurrentPermissions;
 
+                // always unlock
+                agentItem.BasePermissions |= (uint)PermissionMask.Move;
+                           
                 agentItem.CurrentPermissions = agentItem.BasePermissions;
 
                 agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
-- 
cgit v1.1