1 files changed, 16 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 946ed09..8c9d0bb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1351,19 +1351,26 @@ namespace OpenSim.Region.Framework.Scenes
                 if(item.InvType == (sbyte)InventoryType.Landmark)
                     continue;
 
-                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
-                    mask &= ~((uint)PermissionMask.FoldedCopy);
-                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
-                    mask &= ~((uint)PermissionMask.FoldedTransfer);
-                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Export) == 0)
-                    mask &= ~((uint)PermissionMask.FoldedExport);
+                // apply current to normal permission bits
+                uint newperms = item.CurrentPermissions;
 
-                if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                if ((newperms & (uint)PermissionMask.Copy) == 0)
                     mask &= ~(uint)PermissionMask.Copy;
-                if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
+                if ((newperms & (uint)PermissionMask.Transfer) == 0)
                     mask &= ~(uint)PermissionMask.Transfer;
-                if ((item.CurrentPermissions & (uint)PermissionMask.Export) == 0)
+                if ((newperms & (uint)PermissionMask.Export) == 0)
                     mask &= ~((uint)PermissionMask.Export);
+               
+                // apply next owner restricted by current to folded bits 
+                newperms &= item.NextPermissions;
+
+                if ((newperms & (uint)PermissionMask.Copy) == 0)
+                   mask &= ~((uint)PermissionMask.FoldedCopy);
+                if ((newperms & (uint)PermissionMask.Transfer) == 0)
+                    mask &= ~((uint)PermissionMask.FoldedTransfer);
+                if ((newperms & (uint)PermissionMask.Export) == 0)
+                    mask &= ~((uint)PermissionMask.FoldedExport);
+
             }
             return mask;
         }