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/Grid | |
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 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 2 |
2 files changed, 5 insertions, 5 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 | |||
57 | metadata = null; | 57 | metadata = null; |
58 | BackendResponse ret; | 58 | BackendResponse ret; |
59 | 59 | ||
60 | AssetBase asset = m_assetProvider.FetchAsset(assetID); | 60 | AssetBase asset = m_assetProvider.GetAsset(assetID); |
61 | 61 | ||
62 | if (asset == null) ret = BackendResponse.NotFound; | 62 | if (asset == null) ret = BackendResponse.NotFound; |
63 | else | 63 | else |
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
75 | assetData = null; | 75 | assetData = null; |
76 | BackendResponse ret; | 76 | BackendResponse ret; |
77 | 77 | ||
78 | AssetBase asset = m_assetProvider.FetchAsset(assetID); | 78 | AssetBase asset = m_assetProvider.GetAsset(assetID); |
79 | 79 | ||
80 | if (asset == null) ret = BackendResponse.NotFound; | 80 | if (asset == null) ret = BackendResponse.NotFound; |
81 | else | 81 | else |
@@ -90,7 +90,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
90 | 90 | ||
91 | public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset) | 91 | public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset) |
92 | { | 92 | { |
93 | asset = m_assetProvider.FetchAsset(assetID); | 93 | asset = m_assetProvider.GetAsset(assetID); |
94 | 94 | ||
95 | if (asset == null) return BackendResponse.NotFound; | 95 | if (asset == null) return BackendResponse.NotFound; |
96 | 96 | ||
@@ -107,7 +107,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
107 | { | 107 | { |
108 | BackendResponse ret; | 108 | BackendResponse ret; |
109 | 109 | ||
110 | m_assetProvider.CreateAsset(asset); | 110 | m_assetProvider.StoreAsset(asset); |
111 | ret = BackendResponse.Success; | 111 | ret = BackendResponse.Success; |
112 | 112 | ||
113 | m_server.MetricsProvider.LogAssetCreate(EXTENSION_NAME, ret, asset.FullID, asset.Data.Length, DateTime.Now); | 113 | 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 | |||
140 | 140 | ||
141 | protected void StoreAsset(AssetBase asset) | 141 | protected void StoreAsset(AssetBase asset) |
142 | { | 142 | { |
143 | m_assetProvider.CreateAsset(asset); | 143 | m_assetProvider.StoreAsset(asset); |
144 | } | 144 | } |
145 | } | 145 | } |
146 | } | 146 | } |