1 files changed, 24 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index bf56de2..b53c355 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -360,7 +360,7 @@ namespace OpenSim.Region.Framework.Scenes
 //             m_log.DebugFormat("[PRIM INVENTORY]: Starting script {0} {1} in prim {2} {3} in {4}",
 //                 item.Name, item.ItemID, m_part.Name, m_part.UUID, m_part.ParentGroup.Scene.RegionInfo.RegionName);
 
-            if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
+            if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item, m_part))
             {
                 StoreScriptError(item.ItemID, "no permission");
                 return false;
@@ -807,6 +807,7 @@ namespace OpenSim.Region.Framework.Scenes
                 else
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
 
+            m_part.AggregateInnerPerms();
             m_inventorySerial++;
             //m_inventorySerial += 2;
             HasInventoryChanged = true;
@@ -829,7 +830,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
             }
             m_items.LockItemsForWrite(false);
-
+            m_part.AggregateInnerPerms();
             m_inventorySerial++;
         }
 
@@ -965,7 +966,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & (uint)PermissionMask.Slam) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
                     {
-                        part.LastOwnerID = part.OwnerID;
+                        if(part.GroupID != part.OwnerID)
+                            part.LastOwnerID = part.OwnerID;
                         part.OwnerID = item.OwnerID;
                         part.Inventory.ChangeInventoryOwner(item.OwnerID);
                     }
@@ -979,6 +981,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 // old code end
                 rootPart.TrimPermissions();
+                group.AggregateDeepPerms();
             }
 
             return true;
@@ -1020,16 +1023,20 @@ namespace OpenSim.Region.Framework.Scenes
                     item.AssetID = m_items[item.ItemID].AssetID;
 
                 m_items[item.ItemID] = item;
+
                 m_inventorySerial++;
                 if (fireScriptEvents)
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
 
                 if (considerChanged)
                 {
+                    m_part.AggregateInnerPerms();
+                    m_part.ParentGroup.AggregatePerms();
                     HasInventoryChanged = true;
                     m_part.ParentGroup.HasGroupChanged = true;
                 }
                 m_items.LockItemsForWrite(false);
+
                 return true;
             }
             else
@@ -1066,6 +1073,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_items.LockItemsForWrite(true);
                 m_items.Remove(itemID);
                 m_items.LockItemsForWrite(false);
+
+                m_part.AggregateInnerPerms();
+                m_part.ParentGroup.AggregatePerms();
+
                 m_inventorySerial++;
                 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
 
@@ -1317,6 +1328,16 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void AggregateInnerPerms(ref uint owner, ref uint group, ref uint everyone)
+        {
+            foreach (TaskInventoryItem item in m_items.Values)
+            {
+                owner &= item.CurrentPermissions;
+                group &= item.GroupPermissions;
+                everyone &= item.EveryonePermissions;
+            }
+        }
+
         public uint MaskEffectivePermissions()
         {
             uint mask=0x7fffffff;