aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-16 19:33:11 +0000
committerJustin Clarke Casey2009-02-16 19:33:11 +0000
commit80759f708b1766b6fd36bbdb6ce69f292e64e2f0 (patch)
tree2ca913692571127b1b9bc5327ddc937b8d0211ab /OpenSim/Data/NHibernate/NHibernateInventoryData.cs
parentline ending fixes and set native eol property (diff)
downloadopensim-SC_OLD-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.zip
opensim-SC_OLD-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.tar.gz
opensim-SC_OLD-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.tar.bz2
opensim-SC_OLD-80759f708b1766b6fd36bbdb6ce69f292e64e2f0.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=3166
* Adds estate access list supports to NHibernate data module * Thanks Tommil
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateInventoryData.cs')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 7657ae5..3e04417 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Data.NHibernate
110 try 110 try
111 { 111 {
112 m_log.InfoFormat("[NHIBERNATE] getInventoryItem {0}", item); 112 m_log.InfoFormat("[NHIBERNATE] getInventoryItem {0}", item);
113 return (InventoryItemBase)manager.Load(typeof(InventoryItemBase), item); 113 return (InventoryItemBase)manager.Get(typeof(InventoryItemBase), item);
114 } 114 }
115 catch 115 catch
116 { 116 {
@@ -158,7 +158,7 @@ namespace OpenSim.Data.NHibernate
158 /// <param name="item"></param> 158 /// <param name="item"></param>
159 public void deleteInventoryItem(UUID itemID) 159 public void deleteInventoryItem(UUID itemID)
160 { 160 {
161 InventoryItemBase item = (InventoryItemBase)manager.Load(typeof(InventoryItemBase), itemID); 161 InventoryItemBase item = (InventoryItemBase)manager.Get(typeof(InventoryItemBase), itemID);
162 if (item != null) 162 if (item != null)
163 { 163 {
164 manager.Delete(item); 164 manager.Delete(item);
@@ -179,7 +179,7 @@ namespace OpenSim.Data.NHibernate
179 { 179 {
180 try 180 try
181 { 181 {
182 return (InventoryFolderBase)manager.Load(typeof(InventoryFolderBase), folder); 182 return (InventoryFolderBase)manager.Get(typeof(InventoryFolderBase), folder);
183 } 183 }
184 catch 184 catch
185 { 185 {
@@ -227,7 +227,7 @@ namespace OpenSim.Data.NHibernate
227 /// <param name="folder"></param> 227 /// <param name="folder"></param>
228 public void deleteInventoryFolder(UUID folderID) 228 public void deleteInventoryFolder(UUID folderID)
229 { 229 {
230 InventoryFolderBase item = (InventoryFolderBase)manager.Load(typeof(InventoryFolderBase), folderID); 230 InventoryFolderBase item = (InventoryFolderBase)manager.Get(typeof(InventoryFolderBase), folderID);
231 if (item != null) 231 if (item != null)
232 { 232 {
233 manager.Delete(item); 233 manager.Delete(item);