ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "git merge"

Browse Source 
This reverts commit 80e1c3742a3ba7eb9aa1686a242b36f64331095a.
This commit is contained in:
Sean Dague
2008-07-17 18:59:10 +00:00
parent dd144e12ba
commit 6084a7ea3e
4 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Data/NHibernate/NHibernateRegionData.cs
View File

@@ -26,6 +26,7 @@
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
@@ -112,6 +113,33 @@ namespace OpenSim.Data.NHibernate
{
return null;
}
private void SaveOrUpdate(SceneObjectPart p)
{
try
{
ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart));
criteria.Add(Expression.Eq("UUID", p.UUID));
if (criteria.List().Count < 1)
{
session.Save(p);
}
else if (criteria.List().Count == 1)
{
SceneObjectPart old = (SceneObjectPart)criteria.List()[0];
session.Evict(old);
session.Update(p);
}
else
{
m_log.Error("Not unique");
}
}
catch (Exception e)
{
m_log.Error("[NHIBERNATE] issue saving asset", e);
}
}
/// <summary>
/// Adds an object into region storage
@@ -125,7 +153,7 @@ namespace OpenSim.Data.NHibernate
foreach (SceneObjectPart part in obj.Children.Values)
{
m_log.InfoFormat("Storing part {0}", part.UUID);
session.SaveOrUpdate(part);
SaveOrUpdate(part);
}
session.Flush();
}