diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 210f5cd03e..02d3991d15 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -811,8 +811,13 @@ namespace OpenSim.Region.Framework.Scenes
             // isn't available (such as drag from prim inventory to agent inventory)
             InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
 
-            List<TaskInventoryItem> items = GetInventoryItems();
-            foreach (TaskInventoryItem item in items)
+            bool includeAssets = false;
+            if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
+                includeAssets = true;
+
+            m_items.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_items.Values)
             {
                 UUID ownerID = item.OwnerID;
                 uint everyoneMask = 0;
@@ -840,7 +845,10 @@ namespace OpenSim.Region.Framework.Scenes
                 invString.AddNameValueLine("group_id", item.GroupID.ToString());
                 invString.AddSectionEnd();
 
-                invString.AddNameValueLine("asset_id", item.AssetID.ToString());
+                if (includeAssets)
+                    invString.AddNameValueLine("asset_id", item.AssetID.ToString());
+                else
+                    invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
                 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
                 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
                 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));