Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.

2 files changed, 58 insertions, 58 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 8a7e869..5009d9e 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Data.MySQL
                     param["?uuid"] = user.ToStringHyphenated();
                     param["?zero"] = LLUUID.Zero.ToStringHyphenated();
 
-                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND (agentID = ?uuid OR category = 0)", param);
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
                     IDataReader reader = result.ExecuteReader();
 
                     List<InventoryFolderBase> items = database.readInventoryFolders(reader);
@@ -152,6 +152,40 @@ namespace OpenSim.Framework.Data.MySQL
         }
 
         /// <summary>
+        /// Returns the users inventory root folder.
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public InventoryFolderBase getUserRootFolder(LLUUID user)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = user.ToStringHyphenated();
+                    param["?zero"] = LLUUID.Zero.ToStringHyphenated();
+
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
+                    IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
+                    InventoryFolderBase rootFolder = items[0]; //should only be one folder with parent set to zero (the root one).
+                    reader.Close();
+                    result.Dispose();
+
+                    return rootFolder;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
         /// Returns a list of folders in a users inventory contained within the specified folder
         /// </summary>
         /// <param name="parentID">The folder to search</param>
@@ -314,27 +348,5 @@ namespace OpenSim.Framework.Data.MySQL
         {
             addInventoryFolder(folder);
         }
-
-        public void deleteInventoryCategory(InventoryCategory inventoryCategory)
-        {
-            try
-            {
-                lock (database) {
-                    IDbCommand cmd = database.Query(string.Format("DELETE FROM inventoryitems WHERE parentFolderID IN (SELECT folderId FROM inventoryfolders WHERE category={0})", (byte)inventoryCategory), null);
-                    cmd.ExecuteNonQuery();
-
-
-                    cmd = database.Query(string.Format("DELETE FROM inventoryfolders WHERE category={0}", (byte)inventoryCategory), null);
-                    cmd.ExecuteNonQuery();
-                }
-
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-            }
-        }
-
     }
 }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index e55606e..5037f98 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data.MySQL
         /// <summary>
         /// The database connection object
         /// </summary>
-        MySqlConnection dbcon;
+        IDbConnection dbcon;
         /// <summary>
         /// Connection string for ADO.net
         /// </summary>
@@ -115,11 +115,10 @@ namespace OpenSim.Framework.Data.MySQL
             {
                 MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
                 dbcommand.CommandText = sql;
-                if(parameters != null)
-                    foreach (KeyValuePair<string, string> param in parameters)
-                    {
-                        dbcommand.Parameters.Add(param.Key, param.Value);
-                    }
+                foreach (KeyValuePair<string, string> param in parameters)
+                {
+                    dbcommand.Parameters.Add(param.Key, param.Value);
+                }
 
                 return (IDbCommand)dbcommand;
             }
@@ -150,11 +149,10 @@ namespace OpenSim.Framework.Data.MySQL
                     {
                         MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
                         dbcommand.CommandText = sql;
-                        if(parameters != null) 
-                            foreach (KeyValuePair<string, string> param in parameters)
-                            {
-                                dbcommand.Parameters.Add(param.Key, param.Value);
-                            }
+                        foreach (KeyValuePair<string, string> param in parameters)
+                        {
+                            dbcommand.Parameters.Add(param.Key, param.Value);
+                        }
 
                         return (IDbCommand)dbcommand;
                     }
@@ -372,8 +370,6 @@ namespace OpenSim.Framework.Data.MySQL
                     folder.parentID = new LLUUID((string)reader["parentFolderID"]);
                     folder.folderID = new LLUUID((string)reader["folderID"]);
                     folder.name = (string)reader["folderName"];
-                    folder.category = (InventoryCategory)((Int16)reader["category"]);
-                    folder.type = (Int16)reader["folderType"];
 
                     rows.Add(folder);
                 }
@@ -513,32 +509,24 @@ namespace OpenSim.Framework.Data.MySQL
         /// <returns>Success?</returns>
         public bool insertFolder(InventoryFolderBase folder)
         {
-            string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName, category, folderType) VALUES ";
-            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?category, ?folderType)";
-
-            MySqlCommand dbcmd = dbcon.CreateCommand();
-            dbcmd.CommandText = sql;
-
-            LLUUID tmpID = folder.folderID;
-            dbcmd.Parameters.Add(new MySqlParameter("?folderID", tmpID.ToStringHyphenated()));
-            dbcmd.Parameters.Add(new MySqlParameter("?folderID", tmpID.ToStringHyphenated()));
-            tmpID = folder.agentID;
-            dbcmd.Parameters.Add(new MySqlParameter("?agentID", tmpID.ToStringHyphenated()));
-            tmpID = folder.parentID;
-            dbcmd.Parameters.Add(new MySqlParameter("?parentFolderID", tmpID.ToStringHyphenated()));
-            dbcmd.Parameters.Add(new MySqlParameter("?folderName", folder.name));
-            MySqlParameter p = dbcmd.Parameters.Add(new MySqlParameter("?category", MySqlDbType.Byte));
-            p.Value = (byte)folder.category;
-
-            p = dbcmd.Parameters.Add(new MySqlParameter("?folderType", MySqlDbType.Byte));
-            p.Value = (byte)folder.type;
-
-            
+            string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName) VALUES ";
+            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName)";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+            parameters["?folderID"] = folder.folderID.ToStringHyphenated();
+            parameters["?agentID"] = folder.agentID.ToStringHyphenated();
+            parameters["?parentFolderID"] = folder.parentID.ToStringHyphenated();
+            parameters["?folderName"] = folder.name;
+
             bool returnval = false;
             try
             {
-                if (dbcmd.ExecuteNonQuery() == 1)
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
                     returnval = true;
+
+                result.Dispose();
             }
             catch (Exception e)
             {