1 files changed, 18 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 6efcaa7..a2a7392 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1526,10 +1526,14 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
 
                 if (part.OwnerID != remoteClient.AgentId)
-                    return;
-
-                if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                    return;
+                {
+                    // Group permissions
+                    if ( (part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0) )
+                        return;
+                } else {
+                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                        return;
+                }
 
                 if (!Permissions.CanCreateObjectInventory(
                     itemBase.InvType, part.UUID, remoteClient.AgentId))
@@ -1598,13 +1602,18 @@ namespace OpenSim.Region.Framework.Scenes
                         destId);
                 return;
             }
-
+            
             // Must own the object, and have modify rights
             if (srcPart.OwnerID != destPart.OwnerID)
-                return;
-
-            if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                return;
+            {
+                // Group permissions
+                if ( (destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) ||
+                ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0) )
+                    return;
+            } else {
+                if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                    return;
+            }
 
             if (destPart.ScriptAccessPin != pin)
             {