From 5c21ec6d108313080ccf8bdf2212ce52ad80bbb5 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 14 Nov 2008 13:03:18 +0000
Subject: 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".

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 590bea0..12095e5 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1179,8 +1179,7 @@ namespace OpenSim.Region.Environment.Scenes
             destTaskItem.InvType = srcTaskItem.InvType;
             destTaskItem.Type = srcTaskItem.Type;
 
-            destPart.AddInventoryItem(destTaskItem, part.OwnerID!=destPart.OwnerID
-				      && ExternalChecks.ExternalChecksPropagatePermissions());
+            destPart.AddInventoryItem(destTaskItem);
 
             if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
                 part.RemoveInventoryItem(itemId);
@@ -1250,16 +1249,11 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (part != null)
             {
-                TaskInventoryItem currentItem = part.GetInventoryItem(itemID);
-		bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
-					   & (uint)PrimFlags.AllowInventoryDrop) != 0;
-		// Explicity allow anyone to add to the inventory if the AllowInventoryDrop
-		// flag has been set. Don't however let them update an item unless
-		// they pass the external checks
-                if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)
-		    && (currentItem != null || !allowInventoryDrop ))
+                if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId))
                     return;
 
+                TaskInventoryItem currentItem = part.GetInventoryItem(itemID);
+
                 if (currentItem == null)
                 {
                     UUID copyID = UUID.Random();
@@ -1423,7 +1417,7 @@ namespace OpenSim.Region.Environment.Scenes
                 taskItem.PermsMask = 0;
                 taskItem.AssetID = asset.FullID;
 
-                part.AddInventoryItem(taskItem, false);
+                part.AddInventoryItem(taskItem);
                 part.GetProperties(remoteClient);
 
                 part.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
@@ -1518,7 +1512,7 @@ namespace OpenSim.Region.Environment.Scenes
             destTaskItem.InvType = srcTaskItem.InvType;
             destTaskItem.Type = srcTaskItem.Type;
 
-            destPart.AddInventoryItemExclusive(destTaskItem, false);
+            destPart.AddInventoryItemExclusive(destTaskItem);
 
             if (running > 0)
             {
-- 
cgit v1.1