rename sog.GetEffectivePermissions() since its use is now limited to more specific task, and no longer on current effective(full) path. Note that change ownermask start to be current ownermask, and filter it to all parts basemask

2 files changed, 10 insertions, 17 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 916ddb0..f1885da 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -579,26 +579,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             IClientAPI remoteClient)
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export | PermissionMask.FoldedMask);
- 
-            // For the porposes of inventory, an object is modify if the prims
-            // are modify. This allows renaming an object that contains no
-            // mod items.
+       
             foreach (SceneObjectGroup grp in objsForEffectivePermissions)
             {
-                uint groupPerms = grp.GetEffectivePermissions(true);
-//                if ((grp.RootPart.BaseMask & (uint)PermissionMask.Modify) != 0)
-//                    groupPerms |= (uint)PermissionMask.Modify;
-
-                effectivePerms &= groupPerms;
+                effectivePerms &= grp.CurrentAndFoldedNextPermissions();
             }
  
             if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
             {
+                // apply parts inventory items next owner
                 PermissionsUtil.ApplyNoModFoldedPermissions(effectivePerms, ref effectivePerms);
-
+                // change to next owner
                 uint basePerms = effectivePerms & so.RootPart.NextOwnerMask;
-                
-                // rebuild folded perms since we don't have then on inworld objects
+                // fix and update folded
                 basePerms = PermissionsUtil.FixAndFoldPermissions(basePerms);
                
                 item.BasePermissions = basePerms;               
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 6854b53..d1a109e 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -206,12 +206,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 item.InvType = (int)InventoryType.Object;
                 item.Folder = categoryID;
                 
-                perms = group.GetEffectivePermissions(false);
-               
+                perms = group.CurrentAndFoldedNextPermissions();
+                // apply parts inventory next perms            
                 PermissionsUtil.ApplyNoModFoldedPermissions(perms, ref perms);
-
-                perms &=  part.NextOwnerMask;
-
+                // change to next owner perms
+                perms &=  part.NextOwnerMask; 
+                // update folded
                 perms = PermissionsUtil.FixAndFoldPermissions(perms);
 
                 item.BasePermissions = perms;