1 files changed, 4 insertions, 36 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 636afac..a55936f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1317,48 +1317,16 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        // reduce to minimal set
-        public void AggregateEveryOnePerms(ref uint current)
+        public void AggregateInnerPerms(ref uint owner, ref uint group, ref uint everyone)
         {
             foreach (TaskInventoryItem item in m_items.Values)
             {
-                current &= item.EveryonePermissions;
-                if(current == 0)
-                    break;
-            }
-        }
-
-        public void AggregateGroupPerms(ref uint current)
-        {
-            foreach (TaskInventoryItem item in m_items.Values)
-            {
-                current &= item.GroupPermissions;
-                if(current == 0)
-                    break;
+                owner &= item.CurrentPermissions;
+                group &= item.GroupPermissions;
+                everyone &= item.EveryonePermissions;
             }
         }
 
-        public void AggregateGroupOrEveryonePerms(ref uint current)
-        {
-            foreach (TaskInventoryItem item in m_items.Values)
-            {
-                current &= (item.GroupPermissions | item.EveryonePermissions);
-                if(current == 0)
-                    break;
-            }
-        }
-
-        public void AggregateOwnerPerms(ref uint current)
-        {
-            foreach (TaskInventoryItem item in m_items.Values)
-            {
-                current &= item.CurrentPermissions;
-                if(current == 0)
-                    break;
-            }
-        }
-
-
         public uint MaskEffectivePermissions()
         {
             uint mask=0x7fffffff;