diff options
author | Kunnis | 2009-08-16 18:54:20 -0500 |
---|---|---|
committer | Melanie | 2009-08-19 23:45:22 +0100 |
commit | f1287cc7af7da26910c5cba456a8c35b6454d815 (patch) | |
tree | c02fccc67728d57b5097a3ba643bb8ed6987ee8c /OpenSim/Framework | |
parent | Fixes GetRootFolder for normal standalone, which was being incorrectly redire... (diff) | |
download | opensim-SC_OLD-f1287cc7af7da26910c5cba456a8c35b6454d815.zip opensim-SC_OLD-f1287cc7af7da26910c5cba456a8c35b6454d815.tar.gz opensim-SC_OLD-f1287cc7af7da26910c5cba456a8c35b6454d815.tar.bz2 opensim-SC_OLD-f1287cc7af7da26910c5cba456a8c35b6454d815.tar.xz |
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/GetAssetStreamHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/PostAssetStreamHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | 2 |
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 | |||
57 | 57 | ||
58 | protected override AssetBase GetAsset(UUID assetID) | 58 | protected override AssetBase GetAsset(UUID assetID) |
59 | { | 59 | { |
60 | return m_assetProvider.FetchAsset(assetID); | 60 | return m_assetProvider.GetAsset(assetID); |
61 | } | 61 | } |
62 | } | 62 | } |
63 | } | 63 | } |
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 | |||
57 | AssetBase asset = (AssetBase) xs.Deserialize(request); | 57 | AssetBase asset = (AssetBase) xs.Deserialize(request); |
58 | 58 | ||
59 | m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID); | 59 | m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID); |
60 | m_assetProvider.CreateAsset(asset); | 60 | m_assetProvider.StoreAsset(asset); |
61 | 61 | ||
62 | return new byte[] {}; | 62 | return new byte[] {}; |
63 | } | 63 | } |
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 | |||
128 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); | 128 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); |
129 | handler = new GetAssetStreamHandler(assetDataPlugin); | 129 | handler = new GetAssetStreamHandler(assetDataPlugin); |
130 | 130 | ||
131 | assetDataPlugin.CreateAsset(asset); | 131 | assetDataPlugin.StoreAsset(asset); |
132 | return asset; | 132 | return asset; |
133 | } | 133 | } |
134 | } | 134 | } |