Merge branch 'master' of ssh://MyConnection/var/git/opensim

2 files changed, 10 insertions, 28 deletions

diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 9d8cec5..aaba15c 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -65,30 +65,24 @@ namespace OpenSim.Data.NHibernate
 
         }
 
-        override protected AssetBase FetchStoredAsset(UUID uuid)
+        override public AssetBase GetAsset(UUID uuid)
         {
             return (AssetBase)manager.Get(typeof(AssetBase), uuid);
         }
 
-        private void Save(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.FullID);
             if (temp == null)
             {
+                m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID);
                 manager.Insert(asset);
             }
-        }
-
-        override public void CreateAsset(AssetBase asset)
-        {
-            m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID);
-            Save(asset);
-        }
-
-        override public void UpdateAsset(AssetBase asset)
-        {
-            m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID);
-            manager.Update(asset);
+            else
+            {
+                m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID);
+                manager.Update(asset);
+            }
         }
 
         // private void LogAssetLoad(AssetBase asset)
@@ -107,7 +101,7 @@ namespace OpenSim.Data.NHibernate
         override public bool ExistsAsset(UUID uuid)
         {
             m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid);
-            return (FetchAsset(uuid) != null);
+            return (GetAsset(uuid) != null);
         }
 
         /// <summary>
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs
index fe8da59..018af62 100644
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Data.NHibernate
             throw new NotImplementedException();
         }
 
-        public override DataResponse AddProfile(RegionProfileData profile)
+        public override DataResponse StoreProfile(RegionProfileData profile)
         {
             if (manager.Get(typeof(RegionProfileData), profile.Uuid) == null)
             {
@@ -126,21 +126,9 @@ namespace OpenSim.Data.NHibernate
             }
             else
             {
-                return DataResponse.RESPONSE_ERROR;
-            }
-        }
-
-        public override DataResponse UpdateProfile(RegionProfileData profile)
-        {
-            if (manager.Get(typeof(RegionProfileData), profile.Uuid) != null)
-            {
                 manager.Update(profile);
                 return DataResponse.RESPONSE_OK;
             }
-            else
-            {
-                return DataResponse.RESPONSE_ERROR;
-            }
         }
 
         public override DataResponse DeleteProfile(string uuid)