From 80759f708b1766b6fd36bbdb6ce69f292e64e2f0 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 16 Feb 2009 19:33:11 +0000 Subject: * Apply http://opensimulator.org/mantis/view.php?id=3166 * Adds estate access list supports to NHibernate data module * Thanks Tommil --- OpenSim/Data/NHibernate/NHibernateEstateData.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Data/NHibernate/NHibernateEstateData.cs') diff --git a/OpenSim/Data/NHibernate/NHibernateEstateData.cs b/OpenSim/Data/NHibernate/NHibernateEstateData.cs index 3d74135..b16f6e1 100644 --- a/OpenSim/Data/NHibernate/NHibernateEstateData.cs +++ b/OpenSim/Data/NHibernate/NHibernateEstateData.cs @@ -89,7 +89,7 @@ namespace OpenSim.Data.NHibernate // Ensure that estate settings exist for the link if (link != null) { - if (manager.Load(typeof(EstateSettings), link.EstateID) == null) + if (manager.GetWithStatefullSession(typeof(EstateSettings), link.EstateID) == null) { // Delete broken link manager.Delete(link); @@ -116,11 +116,11 @@ namespace OpenSim.Data.NHibernate link.EstateRegionLinkID = UUID.Random(); link.RegionID = regionID; link.EstateID = estateID; - manager.Insert(link); + manager.InsertWithStatefullSession(link); } // Load estate settings according to the existing or created link. - return (EstateSettings)manager.Load(typeof(EstateSettings), link.EstateID); + return (EstateSettings)manager.GetWithStatefullSession(typeof(EstateSettings), link.EstateID); } public void StoreEstateSettings(EstateSettings estateSettings) @@ -128,7 +128,7 @@ namespace OpenSim.Data.NHibernate // Estates are always updated when stored. // Insert is always done via. load method as with the current API // this is explicitly the only way to create region link. - manager.Update(estateSettings); + manager.UpdateWithStatefullSession(estateSettings); } #endregion -- cgit v1.1