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

3 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
index 0631ee7..92ac84f 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
             metadata = null;
             BackendResponse ret;
 
-            AssetBase asset = m_assetProvider.FetchAsset(assetID);
+            AssetBase asset = m_assetProvider.GetAsset(assetID);
 
             if (asset == null) ret = BackendResponse.NotFound;
             else
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
             assetData = null;
             BackendResponse ret;
 
-            AssetBase asset = m_assetProvider.FetchAsset(assetID);
+            AssetBase asset = m_assetProvider.GetAsset(assetID);
 
             if (asset == null) ret = BackendResponse.NotFound;
             else
@@ -90,7 +90,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
 
         public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset)
         {
-            asset = m_assetProvider.FetchAsset(assetID);
+            asset = m_assetProvider.GetAsset(assetID);
 
             if (asset == null) return BackendResponse.NotFound;
 
@@ -107,7 +107,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
         {
             BackendResponse ret;
 
-            m_assetProvider.CreateAsset(asset);
+            m_assetProvider.StoreAsset(asset);
             ret = BackendResponse.Success;
 
             m_server.MetricsProvider.LogAssetCreate(EXTENSION_NAME, ret, asset.FullID, asset.Data.Length, DateTime.Now);
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index f25e847..ac8f888 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Grid.AssetServer
 
         protected void StoreAsset(AssetBase asset)
         {
-            m_assetProvider.CreateAsset(asset);
+            m_assetProvider.StoreAsset(asset);
         }
     }
 }
diff --git a/OpenSim/Grid/GridServer.Modules/GridDBService.cs b/OpenSim/Grid/GridServer.Modules/GridDBService.cs
index caa2c10..fd5a09a 100644
--- a/OpenSim/Grid/GridServer.Modules/GridDBService.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridDBService.cs
@@ -206,11 +206,11 @@ namespace OpenSim.Grid.GridServer.Modules
                 {
                     if (existingSim == null)
                     {
-                        insertResponse = plugin.AddProfile(sim);
+                        insertResponse = plugin.StoreProfile(sim);
                     }
                     else
                     {
-                        insertResponse = plugin.UpdateProfile(sim);
+                        insertResponse = plugin.StoreProfile(sim);
                     }
                 }
                 catch (Exception e)
@@ -259,7 +259,7 @@ namespace OpenSim.Grid.GridServer.Modules
                     if ((reserveData != null && reserveData.gridRecvKey == theSim.regionRecvKey) ||
                         (reserveData == null && authkeynode.InnerText != theSim.regionRecvKey))
                     {
-                        plugin.AddProfile(theSim);
+                        plugin.StoreProfile(theSim);
                         m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")");
                         logToDB(theSim.ToString(), "RestSetSimMethod", String.Empty, 5,
                                 "Region successfully updated and connected to grid.");