From a6d27e09295cd0160d3439fbfa6598f08c431608 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 8 Apr 2008 23:26:31 +0000 Subject: further refactor and rename of InventoryFolderBase properties to reflect what they really are. --- OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 6 +++--- OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 ++-- OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 8 ++++---- OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index f53d9f9..09d4710 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs @@ -370,7 +370,7 @@ namespace OpenSim.Data.MSSQL try { InventoryFolderBase folder = new InventoryFolderBase(); - folder.AgentID = new LLUUID((string) reader["agentID"]); + folder.Owner = new LLUUID((string) reader["agentID"]); folder.ParentID = new LLUUID((string) reader["parentFolderID"]); folder.ID = new LLUUID((string) reader["folderID"]); folder.Name = (string) reader["folderName"]; @@ -558,7 +558,7 @@ namespace OpenSim.Data.MSSQL Dictionary param = new Dictionary(); param["folderID"] = folder.ID.ToString(); - param["agentID"] = folder.AgentID.ToString(); + param["agentID"] = folder.Owner.ToString(); param["parentFolderID"] = folder.ParentID.ToString(); param["folderName"] = folder.Name; param["type"] = Convert.ToString(folder.Type); @@ -590,7 +590,7 @@ namespace OpenSim.Data.MSSQL "version = @version where " + "folderID = @keyFolderID;", database.getConnection()); SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString()); - SqlParameter param2 = new SqlParameter("@agentID", folder.AgentID.ToString()); + SqlParameter param2 = new SqlParameter("@agentID", folder.Owner.ToString()); SqlParameter param3 = new SqlParameter("@parentFolderID", folder.ParentID.ToString()); SqlParameter param4 = new SqlParameter("@folderName", folder.Name); SqlParameter param5 = new SqlParameter("@type", folder.Type); diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 6cc8998..ce9829a 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -381,7 +381,7 @@ namespace OpenSim.Data.MySQL try { InventoryFolderBase folder = new InventoryFolderBase(); - folder.AgentID = new LLUUID((string) reader["agentID"]); + folder.Owner = new LLUUID((string) reader["agentID"]); folder.ParentID = new LLUUID((string) reader["parentFolderID"]); folder.ID = new LLUUID((string) reader["folderID"]); folder.Name = (string) reader["folderName"]; @@ -508,7 +508,7 @@ namespace OpenSim.Data.MySQL MySqlCommand cmd = new MySqlCommand(sql, database.Connection); cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString()); - cmd.Parameters.AddWithValue("?agentID", folder.AgentID.ToString()); + cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString()); cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString()); cmd.Parameters.AddWithValue("?folderName", folder.Name); cmd.Parameters.AddWithValue("?type", (short) folder.Type); diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index 6bc2e62..9e35b76 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs @@ -73,11 +73,11 @@ namespace OpenSim.Data.NHibernate cfg.AddAssembly("OpenSim.Data.NHibernate"); HbmSerializer.Default.Validate = true; - // using ( System.IO.MemoryStream stream = - // HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) - // cfg.AddInputStream(stream); + using ( System.IO.MemoryStream stream = + HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) + cfg.AddInputStream(stream); - // new SchemaExport(cfg).Create(true, true); + new SchemaExport(cfg).Create(true, true); factory = cfg.BuildSessionFactory(); } diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index e8663b4..4ccea59 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs @@ -592,7 +592,7 @@ namespace OpenSim.Data.SQLite InventoryFolderBase folder = new InventoryFolderBase(); folder.ID = new LLUUID((string) row["UUID"]); folder.Name = (string) row["name"]; - folder.AgentID = new LLUUID((string) row["agentID"]); + folder.Owner = new LLUUID((string) row["agentID"]); folder.ParentID = new LLUUID((string) row["parentID"]); folder.Type = Convert.ToInt16(row["type"]); folder.Version = Convert.ToUInt16(row["version"]); @@ -603,7 +603,7 @@ namespace OpenSim.Data.SQLite { row["UUID"] = Util.ToRawUuidString(folder.ID); row["name"] = folder.Name; - row["agentID"] = Util.ToRawUuidString(folder.AgentID); + row["agentID"] = Util.ToRawUuidString(folder.Owner); row["parentID"] = Util.ToRawUuidString(folder.ParentID); row["type"] = folder.Type; row["version"] = folder.Version; -- cgit v1.1