From bdd7849094996392417ea3e5080578a04b69afac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 May 2011 00:51:14 +0100
Subject: Allow item links to be deleted even when other deletes and purges are
 disabled.

If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved.  When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
---
 .../Services/InventoryService/XInventoryService.cs | 34 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Services/InventoryService/XInventoryService.cs')

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;
         }
-- 
cgit v1.1