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

3 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index bc046cf..c6958de 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers
 
         protected override AssetBase GetAsset(UUID assetID)
         {
-            return m_assetProvider.FetchAsset(assetID);
+            return m_assetProvider.GetAsset(assetID);
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
index 419b408..8bf406c 100644
--- a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers
             AssetBase asset = (AssetBase) xs.Deserialize(request);
 
             m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
-            m_assetProvider.CreateAsset(asset);
+            m_assetProvider.StoreAsset(asset);
 
             return new byte[] {};
         }
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
index 35da73f..be3f518 100644
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Framework.Servers.Tests
             IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin();
             handler = new GetAssetStreamHandler(assetDataPlugin);
 
-            assetDataPlugin.CreateAsset(asset);
+            assetDataPlugin.StoreAsset(asset);
             return asset;
         }
     }