aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs4
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs8
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs4
4 files changed, 11 insertions, 11 deletions
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
370 try 370 try
371 { 371 {
372 InventoryFolderBase folder = new InventoryFolderBase(); 372 InventoryFolderBase folder = new InventoryFolderBase();
373 folder.AgentID = new LLUUID((string) reader["agentID"]); 373 folder.Owner = new LLUUID((string) reader["agentID"]);
374 folder.ParentID = new LLUUID((string) reader["parentFolderID"]); 374 folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
375 folder.ID = new LLUUID((string) reader["folderID"]); 375 folder.ID = new LLUUID((string) reader["folderID"]);
376 folder.Name = (string) reader["folderName"]; 376 folder.Name = (string) reader["folderName"];
@@ -558,7 +558,7 @@ namespace OpenSim.Data.MSSQL
558 558
559 Dictionary<string, string> param = new Dictionary<string, string>(); 559 Dictionary<string, string> param = new Dictionary<string, string>();
560 param["folderID"] = folder.ID.ToString(); 560 param["folderID"] = folder.ID.ToString();
561 param["agentID"] = folder.AgentID.ToString(); 561 param["agentID"] = folder.Owner.ToString();
562 param["parentFolderID"] = folder.ParentID.ToString(); 562 param["parentFolderID"] = folder.ParentID.ToString();
563 param["folderName"] = folder.Name; 563 param["folderName"] = folder.Name;
564 param["type"] = Convert.ToString(folder.Type); 564 param["type"] = Convert.ToString(folder.Type);
@@ -590,7 +590,7 @@ namespace OpenSim.Data.MSSQL
590 "version = @version where " + 590 "version = @version where " +
591 "folderID = @keyFolderID;", database.getConnection()); 591 "folderID = @keyFolderID;", database.getConnection());
592 SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString()); 592 SqlParameter param1 = new SqlParameter("@folderID", folder.ID.ToString());
593 SqlParameter param2 = new SqlParameter("@agentID", folder.AgentID.ToString()); 593 SqlParameter param2 = new SqlParameter("@agentID", folder.Owner.ToString());
594 SqlParameter param3 = new SqlParameter("@parentFolderID", folder.ParentID.ToString()); 594 SqlParameter param3 = new SqlParameter("@parentFolderID", folder.ParentID.ToString());
595 SqlParameter param4 = new SqlParameter("@folderName", folder.Name); 595 SqlParameter param4 = new SqlParameter("@folderName", folder.Name);
596 SqlParameter param5 = new SqlParameter("@type", folder.Type); 596 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
381 try 381 try
382 { 382 {
383 InventoryFolderBase folder = new InventoryFolderBase(); 383 InventoryFolderBase folder = new InventoryFolderBase();
384 folder.AgentID = new LLUUID((string) reader["agentID"]); 384 folder.Owner = new LLUUID((string) reader["agentID"]);
385 folder.ParentID = new LLUUID((string) reader["parentFolderID"]); 385 folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
386 folder.ID = new LLUUID((string) reader["folderID"]); 386 folder.ID = new LLUUID((string) reader["folderID"]);
387 folder.Name = (string) reader["folderName"]; 387 folder.Name = (string) reader["folderName"];
@@ -508,7 +508,7 @@ namespace OpenSim.Data.MySQL
508 508
509 MySqlCommand cmd = new MySqlCommand(sql, database.Connection); 509 MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
510 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString()); 510 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
511 cmd.Parameters.AddWithValue("?agentID", folder.AgentID.ToString()); 511 cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
512 cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString()); 512 cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
513 cmd.Parameters.AddWithValue("?folderName", folder.Name); 513 cmd.Parameters.AddWithValue("?folderName", folder.Name);
514 cmd.Parameters.AddWithValue("?type", (short) folder.Type); 514 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
73 cfg.AddAssembly("OpenSim.Data.NHibernate"); 73 cfg.AddAssembly("OpenSim.Data.NHibernate");
74 74
75 HbmSerializer.Default.Validate = true; 75 HbmSerializer.Default.Validate = true;
76 // using ( System.IO.MemoryStream stream = 76 using ( System.IO.MemoryStream stream =
77 // HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 77 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
78 // cfg.AddInputStream(stream); 78 cfg.AddInputStream(stream);
79 79
80 // new SchemaExport(cfg).Create(true, true); 80 new SchemaExport(cfg).Create(true, true);
81 81
82 factory = cfg.BuildSessionFactory(); 82 factory = cfg.BuildSessionFactory();
83 } 83 }
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
592 InventoryFolderBase folder = new InventoryFolderBase(); 592 InventoryFolderBase folder = new InventoryFolderBase();
593 folder.ID = new LLUUID((string) row["UUID"]); 593 folder.ID = new LLUUID((string) row["UUID"]);
594 folder.Name = (string) row["name"]; 594 folder.Name = (string) row["name"];
595 folder.AgentID = new LLUUID((string) row["agentID"]); 595 folder.Owner = new LLUUID((string) row["agentID"]);
596 folder.ParentID = new LLUUID((string) row["parentID"]); 596 folder.ParentID = new LLUUID((string) row["parentID"]);
597 folder.Type = Convert.ToInt16(row["type"]); 597 folder.Type = Convert.ToInt16(row["type"]);
598 folder.Version = Convert.ToUInt16(row["version"]); 598 folder.Version = Convert.ToUInt16(row["version"]);
@@ -603,7 +603,7 @@ namespace OpenSim.Data.SQLite
603 { 603 {
604 row["UUID"] = Util.ToRawUuidString(folder.ID); 604 row["UUID"] = Util.ToRawUuidString(folder.ID);
605 row["name"] = folder.Name; 605 row["name"] = folder.Name;
606 row["agentID"] = Util.ToRawUuidString(folder.AgentID); 606 row["agentID"] = Util.ToRawUuidString(folder.Owner);
607 row["parentID"] = Util.ToRawUuidString(folder.ParentID); 607 row["parentID"] = Util.ToRawUuidString(folder.ParentID);
608 row["type"] = folder.Type; 608 row["type"] = folder.Type;
609 row["version"] = folder.Version; 609 row["version"] = folder.Version;