Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 28 insertions, 6 deletions

diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 0af35c8..2282ee8 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -393,6 +393,10 @@ namespace OpenSim.Services.InventoryService
 
         public virtual bool UpdateItem(InventoryItemBase item)
         {
+            if (!m_AllowDelete)
+                if (item.AssetType == (sbyte)AssetType.Link || item.AssetType == (sbyte)AssetType.LinkFolder)
+                    return false;
+
             return m_Database.StoreItem(ConvertFromOpenSim(item));
         }
 
@@ -411,12 +415,30 @@ namespace OpenSim.Services.InventoryService
         public virtual bool DeleteItems(UUID principalID, List<UUID> itemIDs)
         {
             if (!m_AllowDelete)
-                return false;
-
-            // Just use the ID... *facepalms*
-            //
-            foreach (UUID id in itemIDs)
-                m_Database.DeleteItems("inventoryID", id.ToString());
+            {
+                // We must still allow links and links to folders to be deleted, otherwise they will build up
+                // in the player's inventory until they can no longer log in.  Deletions of links due to code bugs or
+                // similar is inconvenient but on a par with accidental movement of items.  The original item is never
+                // touched.
+                foreach (UUID id in itemIDs)
+                {
+                    if (!m_Database.DeleteItems(
+                        new string[] { "inventoryID", "assetType" },
+                        new string[] { id.ToString(), ((sbyte)AssetType.Link).ToString() }));
+                    {
+                        m_Database.DeleteItems(
+                            new string[] { "inventoryID", "assetType" },
+                            new string[] { id.ToString(), ((sbyte)AssetType.LinkFolder).ToString() });
+                    }
+                }
+            }
+            else
+            {
+                // Just use the ID... *facepalms*
+                //
+                foreach (UUID id in itemIDs)
+                    m_Database.DeleteItems("inventoryID", id.ToString());
+            }
 
             return true;
         }