ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

further refactor and rename of InventoryFolderBase properties

Browse Source 
to reflect what they really are.
This commit is contained in:
Sean Dague
2008-04-08 23:26:31 +00:00
parent 8c82117207
commit a6d27e0929
12 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/MSSQL/MSSQLInventoryData.cs
View File

@@ -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<string, string> param = new Dictionary<string, string>();
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);

4
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

@@ -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);

8
OpenSim/Data/NHibernate/NHibernateInventoryData.cs
View File

@@ -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();
}

4
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

@@ -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;