fix for a change in inventory that meant I was returning a lot
of empty inventory folders0.6.0-stable
parent
d104b75116
commit
b1327dda01
|
@ -392,8 +392,6 @@ 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", LLUUID.Zero));
|
criteria.Add(Expression.Eq("ParentID", LLUUID.Zero));
|
||||||
criteria.Add(Expression.Eq("Owner", user));
|
criteria.Add(Expression.Eq("Owner", user));
|
||||||
|
@ -402,12 +400,7 @@ namespace OpenSim.Data.NHibernate
|
||||||
return folder;
|
return folder;
|
||||||
}
|
}
|
||||||
m_log.ErrorFormat("No Inventory Root Folder Found for: {0}", user);
|
m_log.ErrorFormat("No Inventory Root Folder Found for: {0}", user);
|
||||||
return new InventoryFolderBase();
|
return null;
|
||||||
// }
|
|
||||||
// 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);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue