2 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index eac74c2..b67de7e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1009,8 +1009,7 @@ namespace OpenSim.Region.Environment.Scenes
                 return;
             }
             
-            // todo: also check llAllowInventoryDrop when implemented
-            if(part.OwnerID != destPart.OwnerID)
+                        if(part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.AllowInventoryDrop) == 0)
             {
                 // object cannot copy items to an object owned by a different owner
                 // unless llAllowInventoryDrop has been called
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 85351f4..1f5f00f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -97,6 +97,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         // TODO: This needs to be persisted in next XML version update!
         [XmlIgnore] public int[] PayPrice = {-2,-2,-2,-2,-2};
+        [XmlIgnore] public bool AllowedDrop = false;
         [XmlIgnore] private Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
         [XmlIgnore] public scriptEvents m_aggregateScriptEvents=0;
         [XmlIgnore] private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None;
@@ -2786,6 +2787,11 @@ namespace OpenSim.Region.Environment.Scenes
                 objectflagupdate |= (uint) LLObject.ObjectFlags.Money;
             }
 
+            if (AllowedDrop)
+            {
+                objectflagupdate |= (uint) LLObject.ObjectFlags.AllowInventoryDrop;
+            }
+
             if (
                 ((m_aggregateScriptEvents & scriptEvents.collision) != 0) ||
                 ((m_aggregateScriptEvents & scriptEvents.collision_end) != 0) ||