diff options
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/Plugins/Simple')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs index 301a55f..5a718f2 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs | |||
@@ -95,10 +95,10 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
95 | return ret; | 95 | return ret; |
96 | } | 96 | } |
97 | 97 | ||
98 | public BackendResponse TryFetchDataMetadata(UUID assetID, out Metadata metadata, out byte[] assetData) | 98 | public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset) |
99 | { | 99 | { |
100 | metadata = null; | 100 | Metadata metadata = null; |
101 | assetData = null; | 101 | byte[] assetData = null; |
102 | string filename; | 102 | string filename; |
103 | BackendResponse ret; | 103 | BackendResponse ret; |
104 | 104 | ||
@@ -121,6 +121,16 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
121 | ret = BackendResponse.NotFound; | 121 | ret = BackendResponse.NotFound; |
122 | } | 122 | } |
123 | 123 | ||
124 | asset = new AssetBase(); | ||
125 | asset.Data = assetData; | ||
126 | asset.Metadata.FullID = metadata.ID; | ||
127 | asset.Metadata.Name = metadata.Name; | ||
128 | asset.Metadata.Description = metadata.Description; | ||
129 | asset.Metadata.CreationDate = metadata.CreationDate; | ||
130 | asset.Metadata.Type = (sbyte) Utils.ContentTypeToSLAssetType(metadata.ContentType); | ||
131 | asset.Metadata.Local = false; | ||
132 | asset.Metadata.Temporary = metadata.Temporary; | ||
133 | |||
124 | server.MetricsProvider.LogAssetMetadataFetch(EXTENSION_NAME, ret, assetID, DateTime.Now); | 134 | server.MetricsProvider.LogAssetMetadataFetch(EXTENSION_NAME, ret, assetID, DateTime.Now); |
125 | server.MetricsProvider.LogAssetDataFetch(EXTENSION_NAME, ret, assetID, (assetData != null ? assetData.Length : 0), DateTime.Now); | 135 | server.MetricsProvider.LogAssetDataFetch(EXTENSION_NAME, ret, assetID, (assetData != null ? assetData.Length : 0), DateTime.Now); |
126 | return ret; | 136 | return ret; |