From bc6995f92123ff29fdfd6f811d3d252d99284527 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 9 May 2010 18:02:36 +0100
Subject: Add Delete handler to SQLite (NG)

---
 OpenSim/Data/SQLite/SQLiteAssetData.cs | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Data/SQLite')

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 9b938fa..2783ba1 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -208,20 +208,6 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
-        /// Delete an asset from database
-        /// </summary>
-        /// <param name="uuid"></param>
-        public void DeleteAsset(UUID uuid)
-        {
-            using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
-
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
         ///
         /// </summary>
         /// <param name="row"></param>
@@ -340,7 +326,22 @@ namespace OpenSim.Data.SQLite
 
         public override bool Delete(string id)
         {
-            return false;
+            UUID assetID;
+
+            if (!UUID.TryParse(id, out assetID))
+                return false;
+
+            lock (this)
+            {
+                using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
+                {
+                    cmd.Parameters.Add(new SqliteParameter(":UUID", assetID.ToString()));
+
+                    cmd.ExecuteNonQuery();
+                }
+            }
+
+            return true;
         }
 
         #endregion
-- 
cgit v1.1