OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for a change in inventory that meant I was returning a lot 

of empty inventory folders
0.6.0-stable
Sean Dague 2008-05-14 15:43:19 +00:00
parent d104b75116
commit b1327dda01
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,22 +392,15 @@ namespace OpenSim.Data.NHibernate
{ {
using (ISession session = factory.OpenSession()) using (ISession session = factory.OpenSession())
{ {
// try ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
// { criteria.Add(Expression.Eq("ParentID", LLUUID.Zero));
ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); criteria.Add(Expression.Eq("Owner", user));
criteria.Add(Expression.Eq("ParentID", LLUUID.Zero)); foreach (InventoryFolderBase folder in criteria.List())
criteria.Add(Expression.Eq("Owner", user)); {
foreach (InventoryFolderBase folder in criteria.List()) return folder;
{ }
return folder; m_log.ErrorFormat("No Inventory Root Folder Found for: {0}", user);
} return null;
m_log.ErrorFormat("No Inventory Root Folder Found for: {0}", user);
return new InventoryFolderBase();
// }
// catch
// {
// return new InventoryFolderBase();
// }
} }
} }
@ -420,19 +413,13 @@ namespace OpenSim.Data.NHibernate
{ {
using (ISession session = factory.OpenSession()) using (ISession session = factory.OpenSession())
{ {
// try
// { ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); criteria.Add(Expression.Eq("ParentID", parentID));
criteria.Add(Expression.Eq("ParentID", parentID)); foreach (InventoryFolderBase item in criteria.List())
foreach (InventoryFolderBase item in criteria.List()) {
{ folders.Add(item);
folders.Add(item); }
}
// }
// catch
// {
// m_log.ErrorFormat("Can't run getInventoryFolders for Folder ID: {0}", parentID);
// }
} }
} }