From 5ee75998ce4d941efd937848d28f3a4dac6ba6cc Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 7 Apr 2008 23:27:05 +0000 Subject: more refactoring, this time on InventoryFolderBase * wrap attributes in properties * clean up names a little bit * clean up name styles --- OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Data/NHibernate') diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index ba1d3e9..6bc2e62 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs @@ -180,7 +180,7 @@ namespace OpenSim.Data.NHibernate /// The folder to be created public void addInventoryFolder(InventoryFolderBase folder) { - if (!ExistsFolder(folder.folderID)) { + if (!ExistsFolder(folder.ID)) { using(ISession session = factory.OpenSession()) { using(ITransaction transaction = session.BeginTransaction()) { session.Save(folder); @@ -188,7 +188,7 @@ namespace OpenSim.Data.NHibernate } } } else { - m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists, updating instead", folder.folderID); + m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists, updating instead", folder.ID); updateInventoryFolder(folder); } } @@ -199,7 +199,7 @@ namespace OpenSim.Data.NHibernate /// The updated folder public void updateInventoryFolder(InventoryFolderBase folder) { - if (ExistsFolder(folder.folderID)) { + if (ExistsFolder(folder.ID)) { using(ISession session = factory.OpenSession()) { using(ITransaction transaction = session.BeginTransaction()) { session.Update(folder); @@ -207,7 +207,7 @@ namespace OpenSim.Data.NHibernate } } } else { - m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists", folder.folderID); + m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists", folder.ID); } } @@ -375,7 +375,7 @@ namespace OpenSim.Data.NHibernate getInventoryFolders(ref folders, Util.ToRawUuidString(parentID)); for (int i = 0; i < folders.Count; i++) - getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].folderID)); + getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].ID)); return folders; } -- cgit v1.1