3 files changed, 13 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 31c0be1..3b7f38e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1160,6 +1160,7 @@ namespace OpenSim.Region.Framework.Scenes
                             item = LibraryService.LibraryRootFolder.FindItem(itemID);
                         }
 
+                        // If we've found the item in the user's inventory or in the library
                         if (item != null)
                         {
                             part.ParentGroup.AddInventoryItem(remoteClient, primLocalID, item, copyID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 71354b4..4034744 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -173,7 +173,9 @@ namespace OpenSim.Region.Framework.Scenes
                             item.NextPermissions;
                     taskItem.NextPermissions = item.NextPermissions;
                     taskItem.CurrentPermissions |= 8;
-                } else {
+                } 
+                else 
+                {
                     taskItem.BasePermissions = item.BasePermissions;
                     taskItem.CurrentPermissions = item.CurrentPermissions;
                     taskItem.CurrentPermissions |= 8;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 77bf6fe..2e13f90 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -527,6 +527,7 @@ namespace OpenSim.Region.Framework.Scenes
             item.ParentID = m_part.UUID;
             item.ParentPartID = m_part.UUID;
             item.Name = name;
+            item.GroupID = m_part.GroupID;
 
             lock (m_items)
             {
@@ -619,6 +620,12 @@ namespace OpenSim.Region.Framework.Scenes
                     item.ParentID = m_part.UUID;
                     item.ParentPartID = m_part.UUID;
                     item.Flags = m_items[item.ItemID].Flags;
+
+                    // If group permissions have been set on, check that the groupID is up to date in case it has
+                    // changed since permissions were last set.
+                    if (item.GroupPermissions != (uint)PermissionMask.None)
+                        item.GroupID = m_part.GroupID;
+                    
                     if (item.AssetID == UUID.Zero)
                     {
                         item.AssetID = m_items[item.ItemID].AssetID;
@@ -770,6 +777,7 @@ namespace OpenSim.Region.Framework.Scenes
                     uint everyoneMask = 0;
                     uint baseMask = item.BasePermissions;
                     uint ownerMask = item.CurrentPermissions;
+                    uint groupMask = item.GroupPermissions;
 
                     invString.AddItemStart();
                     invString.AddNameValueLine("item_id", item.ItemID.ToString());
@@ -779,7 +787,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
                     invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
-                    invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
+                    invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
                     invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
                     invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));