reverting #7295, as it still fails a test case (as pointed out very

kindly by sean) --- lesson learned: just running a "make test" is not
sufficient, you need to precede it by a "make clean".

1 files changed, 8 insertions, 27 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 8275ceb..bfa9763 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -151,42 +151,23 @@ namespace OpenSim.Region.Environment.Scenes
                 taskItem.AssetID = item.AssetID;
                 taskItem.Name = item.Name;
                 taskItem.Description = item.Description;
-                taskItem.OwnerID = part.OwnerID; // Transfer ownership
+                taskItem.OwnerID = item.Owner;
                 taskItem.CreatorID = item.Creator;
                 taskItem.Type = item.AssetType;
                 taskItem.InvType = item.InvType;
 
-                if (remoteClient!=null && remoteClient.AgentId!=part.OwnerID &&
-                    m_scene.ExternalChecks.ExternalChecksPropagatePermissions()) {
-                    taskItem.BasePermissions = item.BasePermissions & item.NextPermissions;
-                    taskItem.CurrentPermissions = item.CurrentPermissions & item.NextPermissions;
-                    taskItem.EveryonePermissions = item.EveryOnePermissions & item.NextPermissions;
-                    taskItem.NextPermissions = item.NextPermissions;
-                    taskItem.CurrentPermissions |= 8;
-                } else {
-                    taskItem.BasePermissions = item.BasePermissions;
-                    taskItem.CurrentPermissions = item.CurrentPermissions;
-                    taskItem.CurrentPermissions |= 8;
-                    taskItem.EveryonePermissions = item.EveryOnePermissions;
-                    taskItem.NextPermissions = item.NextPermissions;
-                }
-
-                        
-
+                taskItem.BasePermissions = item.BasePermissions;
+                taskItem.CurrentPermissions = item.CurrentPermissions;
+                // FIXME: ignoring group permissions for now as they aren't stored in item
+                taskItem.EveryonePermissions = item.EveryOnePermissions;
+                taskItem.NextPermissions = item.NextPermissions;
                 taskItem.Flags = item.Flags;
                 // TODO: These are pending addition of those fields to TaskInventoryItem
 //                taskItem.SalePrice = item.SalePrice;
 //                taskItem.SaleType = item.SaleType;
                 taskItem.CreationDate = (uint)item.CreationDate;
-                
-                bool addFromAllowedDrop = false;
-                if (remoteClient!=null) 
-                {
-                    addFromAllowedDrop = remoteClient.AgentId!=part.OwnerID &&
-                        m_scene.ExternalChecks.ExternalChecksPropagatePermissions();
-                }
-
-                part.AddInventoryItem(taskItem, addFromAllowedDrop);
+
+                part.AddInventoryItem(taskItem);
 
                 return true;
             }