Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

1 files changed, 1 insertions, 13 deletions

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)