update folded permitions if taking from world, or after unfold

1 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5e19a8a..0549571 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1272,14 +1272,16 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     uint perms = agentItem.BasePermissions;
                     PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms );
-                    agentItem.BasePermissions = perms;
+//                    perms |= (uint)PermissionMask.Move;
+//                    agentItem.BasePermissions = perms;
+                    agentItem.BasePermissions = PermissionsUtil.FixAndFoldPermissions(perms);
                 }
                 else
                     agentItem.BasePermissions &= taskItem.CurrentPermissions;
 
                 // always unlock
                 agentItem.BasePermissions |= (uint)PermissionMask.Move;
-                           
+                            
                 agentItem.CurrentPermissions = agentItem.BasePermissions;
 
                 agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;