1 files changed, 70 insertions, 5 deletions

diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index caf18a4..cccc500 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -26,9 +26,10 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Reflection;
-using System.Collections.Generic;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
@@ -118,22 +119,69 @@ namespace OpenSim.Data.MySQL
 
     public class MySqlItemHandler : MySQLGenericTableHandler<XInventoryItem>
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         public MySqlItemHandler(string c, string t, string m) :
                 base(c, t, m)
         {
         }
 
+        public override bool Delete(string field, string val)
+        {
+            XInventoryItem[] retrievedItems = Get(new string[] { field }, new string[] { val });
+            if (retrievedItems.Length == 0)
+                return false;
+
+            if (!base.Delete(field, val))
+                return false;
+
+            // Don't increment folder version here since Delete(string, string) calls Delete(string[], string[])
+//            IncrementFolderVersion(retrievedItems[0].parentFolderID);
+
+            return true;
+        }
+
+        public override bool Delete(string[] fields, string[] vals)
+        {
+            XInventoryItem[] retrievedItems = Get(fields, vals);
+            if (retrievedItems.Length == 0)
+                return false;
+
+            if (!base.Delete(fields, vals))
+                return false;
+
+            HashSet<UUID> deletedItemFolderUUIDs = new HashSet<UUID>();
+
+            Array.ForEach<XInventoryItem>(retrievedItems, i => deletedItemFolderUUIDs.Add(i.parentFolderID));
+
+            foreach (UUID deletedItemFolderUUID in deletedItemFolderUUIDs)
+                IncrementFolderVersion(deletedItemFolderUUID);
+
+            return true;
+        }
+
         public bool MoveItem(string id, string newParent)
         {
+            XInventoryItem[] retrievedItems = Get(new string[] { "inventoryID" }, new string[] { id });
+            if (retrievedItems.Length == 0)
+                return false;
+
+            UUID oldParent = retrievedItems[0].parentFolderID;
+
             using (MySqlCommand cmd = new MySqlCommand())
             {
-
                 cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where inventoryID = ?InventoryID", m_Realm);
                 cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
                 cmd.Parameters.AddWithValue("?InventoryID", id);
 
-                return ExecuteNonQuery(cmd) == 0 ? false : true;
+                if (ExecuteNonQuery(cmd) == 0)
+                    return false;
             }
+
+            IncrementFolderVersion(oldParent);
+            IncrementFolderVersion(newParent);
+
+            return true;
         }
 
         public XInventoryItem[] GetActiveGestures(UUID principalID)
@@ -184,6 +232,21 @@ namespace OpenSim.Data.MySQL
             if (!base.Store(item))
                 return false;
 
+            IncrementFolderVersion(item.parentFolderID);
+
+            return true;
+        }
+
+        private bool IncrementFolderVersion(UUID folderID)
+        {
+            return IncrementFolderVersion(folderID.ToString());
+        }
+
+        private bool IncrementFolderVersion(string folderID)
+        {
+//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
+//            Util.PrintCallStack();
+            
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -193,7 +256,7 @@ namespace OpenSim.Data.MySQL
                     cmd.Connection = dbcon;
 
                     cmd.CommandText = String.Format("update inventoryfolders set version=version+1 where folderID = ?folderID");
-                    cmd.Parameters.AddWithValue("?folderID", item.parentFolderID.ToString());
+                    cmd.Parameters.AddWithValue("?folderID", folderID);
 
                     try
                     {
@@ -205,9 +268,11 @@ namespace OpenSim.Data.MySQL
                     }
                     cmd.Dispose();
                 }
+
                 dbcon.Close();
             }
+
             return true;
         }
     }
-}
+}
\ No newline at end of file