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

1 files changed, 34 insertions, 37 deletions

diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index eb0ba04..d3d752f 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -61,11 +61,10 @@ namespace OpenSim.Framework.Data.SQLite
             MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions");
 
             ds.AcceptChanges();
-
             return;
         }
 
-        public InventoryItemBase buildItem(DataRow row)
+        public InventoryItemBase BuildItem(DataRow row)
         {
             InventoryItemBase item = new InventoryItemBase();
             item.inventoryID = new LLUUID((string)row["UUID"]);
@@ -183,7 +182,7 @@ namespace OpenSim.Framework.Data.SQLite
             DataRow[] rows = inventoryItemTable.Select(selectExp);
             foreach (DataRow row in rows)
             {
-                retval.Add(buildItem(row));
+                retval.Add(BuildItem(row));
             }
 
             return retval;
@@ -196,16 +195,43 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A list of folder objects</returns>
         public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
         {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the users inventory root folder.
+        /// </summary>
+        /// <param name="user">The UUID of the user who is having inventory being returned</param>
+        /// <returns>Root inventory folder</returns>
+        public InventoryFolderBase getUserRootFolder(LLUUID user)
+        {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-
-            string selectExp = "parentID = '" + LLUUID.Zero.ToString() + "' AND (agentID = '" + user.ToString() + "' OR category = 0)";
+            string selectExp = "agentID = '" + user.ToString() + "' AND parentID = '" + LLUUID.Zero.ToString() + "'";
             DataRow[] rows = inventoryFolderTable.Select(selectExp);
             foreach (DataRow row in rows)
             {
                 folders.Add(this.buildFolder(row));
             }
-            return folders;
+
+            if (folders.Count == 1)
+            {
+                //we found the root
+                //System.Console.WriteLine("found root inventory folder");
+                return folders[0];
+            }
+            else if (folders.Count > 1)
+            {
+                //err shouldn't be more than one root
+                //System.Console.WriteLine("found more than one root inventory folder");
+            }
+            else if (folders.Count == 0)
+            {
+                // no root?
+                //System.Console.WriteLine("couldn't find root inventory folder");
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -234,11 +260,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A class containing item information</returns>
         public InventoryItemBase getInventoryItem(LLUUID item)
         {
-            DataRow row = ds.Tables["inventoryitems"].Rows.Find(item);
-            if (row != null)
-                return this.buildItem(row);
-            else
-                return null;
+            return null;
         }
 
         /// <summary>
@@ -248,14 +270,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A class containing folder information</returns>
         public InventoryFolderBase getInventoryFolder(LLUUID folder)
         {
-            DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-            string selectExp = "UUID = '" + folder.ToString() + "'";
-            DataRow[] rows = inventoryFolderTable.Select(selectExp);
-
-            if (rows.Length == 1)
-                return this.buildFolder(rows[0]);
-            else
-                return null;
+            return null;
         }
 
         /// <summary>
@@ -293,11 +308,6 @@ namespace OpenSim.Framework.Data.SQLite
              this.invItemsDa.Update(ds, "inventoryitems");
         }
 
-        //TODO! Implement SQLite deleteInventoryCategory
-        public void deleteInventoryCategory(InventoryCategory inventoryCategory)
-        {
-        }
-
         /// <summary>
         /// Adds a new folder specified by folder
         /// </summary>
@@ -316,11 +326,6 @@ namespace OpenSim.Framework.Data.SQLite
             this.addFolder(folder);
         }
 
-        //TODO! implement CreateNewUserInventory
-        public void CreateNewUserInventory(LLUUID user)
-        {
-            throw new Exception("Function not implemented");
-        }
 
         /***********************************************************************
          *
@@ -345,7 +350,6 @@ namespace OpenSim.Framework.Data.SQLite
             createCol(inv, "parentFolderID", typeof(System.String));
             createCol(inv, "avatarID", typeof(System.String));
             createCol(inv, "creatorsID", typeof(System.String));
-            createCol(inv, "category", typeof(System.Byte));
 
             createCol(inv, "inventoryName", typeof(System.String));
             createCol(inv, "inventoryDescription", typeof(System.String));
@@ -369,7 +373,6 @@ namespace OpenSim.Framework.Data.SQLite
             createCol(fol, "parentID", typeof(System.String));
             createCol(fol, "type", typeof(System.Int32));
             createCol(fol, "version", typeof(System.Int32));
-            createCol(fol, "category", typeof(System.Byte));
             
             fol.PrimaryKey = new DataColumn[] { fol.Columns["UUID"] };
             return fol;
@@ -412,7 +415,6 @@ namespace OpenSim.Framework.Data.SQLite
             folder.parentID = new LLUUID((string)row["parentID"]);
             folder.type = Convert.ToInt16(row["type"]);
             folder.version = Convert.ToUInt16(row["version"]);
-            folder.category = (InventoryCategory)Convert.ToByte(row["category"]);
             return folder;
         }
 
@@ -424,7 +426,6 @@ namespace OpenSim.Framework.Data.SQLite
             row["parentID"] = folder.parentID;
             row["type"] = folder.type;
             row["version"] = folder.version;
-            row["category"] = folder.category;
         }
 
 
@@ -643,7 +644,3 @@ namespace OpenSim.Framework.Data.SQLite
     }
 }
 
-
-
-
-