aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate
diff options
context:
space:
mode:
authorSean Dague2008-04-07 23:27:05 +0000
committerSean Dague2008-04-07 23:27:05 +0000
commit5ee75998ce4d941efd937848d28f3a4dac6ba6cc (patch)
treef29a100cb8ab3715c82f0aec4fee9f968f210405 /OpenSim/Data/NHibernate
parentRefactor InventoryItemBase to do the following: (diff)
downloadopensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.zip
opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.gz
opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.bz2
opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.xz
more refactoring, this time on InventoryFolderBase
* wrap attributes in properties * clean up names a little bit * clean up name styles
Diffstat (limited to 'OpenSim/Data/NHibernate')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs10
1 files changed, 5 insertions, 5 deletions
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
180 /// <param name="folder">The folder to be created</param> 180 /// <param name="folder">The folder to be created</param>
181 public void addInventoryFolder(InventoryFolderBase folder) 181 public void addInventoryFolder(InventoryFolderBase folder)
182 { 182 {
183 if (!ExistsFolder(folder.folderID)) { 183 if (!ExistsFolder(folder.ID)) {
184 using(ISession session = factory.OpenSession()) { 184 using(ISession session = factory.OpenSession()) {
185 using(ITransaction transaction = session.BeginTransaction()) { 185 using(ITransaction transaction = session.BeginTransaction()) {
186 session.Save(folder); 186 session.Save(folder);
@@ -188,7 +188,7 @@ namespace OpenSim.Data.NHibernate
188 } 188 }
189 } 189 }
190 } else { 190 } else {
191 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists, updating instead", folder.folderID); 191 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists, updating instead", folder.ID);
192 updateInventoryFolder(folder); 192 updateInventoryFolder(folder);
193 } 193 }
194 } 194 }
@@ -199,7 +199,7 @@ namespace OpenSim.Data.NHibernate
199 /// <param name="folder">The updated folder</param> 199 /// <param name="folder">The updated folder</param>
200 public void updateInventoryFolder(InventoryFolderBase folder) 200 public void updateInventoryFolder(InventoryFolderBase folder)
201 { 201 {
202 if (ExistsFolder(folder.folderID)) { 202 if (ExistsFolder(folder.ID)) {
203 using(ISession session = factory.OpenSession()) { 203 using(ISession session = factory.OpenSession()) {
204 using(ITransaction transaction = session.BeginTransaction()) { 204 using(ITransaction transaction = session.BeginTransaction()) {
205 session.Update(folder); 205 session.Update(folder);
@@ -207,7 +207,7 @@ namespace OpenSim.Data.NHibernate
207 } 207 }
208 } 208 }
209 } else { 209 } else {
210 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists", folder.folderID); 210 m_log.ErrorFormat("Attempted to add Inventory Folder {0} that already exists", folder.ID);
211 } 211 }
212 } 212 }
213 213
@@ -375,7 +375,7 @@ namespace OpenSim.Data.NHibernate
375 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID)); 375 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID));
376 376
377 for (int i = 0; i < folders.Count; i++) 377 for (int i = 0; i < folders.Count; i++)
378 getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].folderID)); 378 getInventoryFolders(ref folders, Util.ToRawUuidString(folders[i].ID));
379 379
380 return folders; 380 return folders;
381 } 381 }