diff options
| author | Mike Mazur | 2009-03-13 05:58:32 +0000 |
|---|---|---|
| committer | Mike Mazur | 2009-03-13 05:58:32 +0000 |
| commit | 4a21d926684f013aaaa1c349d3d1c11f3d614381 (patch) | |
| tree | 47d74d29d5e11ffa5e7337071d129b8388ea6ffe /OpenSim/Grid/AssetInventoryServer/Plugins/Simple | |
| parent | * Don't fail the client login if there are no OnClientConnect listeners (diff) | |
| download | opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.zip opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.gz opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.bz2 opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.xz | |
Mark AssetBase.Metadata with [XmlIgnore]
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/Plugins/Simple')
| -rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs index 890a6a0..4ec2d96 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs | |||
| @@ -97,7 +97,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
| 97 | public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset) | 97 | public BackendResponse TryFetchDataMetadata(UUID assetID, out AssetBase asset) |
| 98 | { | 98 | { |
| 99 | asset = new AssetBase(); | 99 | asset = new AssetBase(); |
| 100 | AssetMetadata metadata = asset.getMetadata(); | 100 | AssetMetadata metadata = asset.Metadata; |
| 101 | 101 | ||
| 102 | string filename; | 102 | string filename; |
| 103 | BackendResponse ret; | 103 | BackendResponse ret; |
| @@ -139,7 +139,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
| 139 | public BackendResponse TryCreateAsset(AssetBase asset) | 139 | public BackendResponse TryCreateAsset(AssetBase asset) |
| 140 | { | 140 | { |
| 141 | BackendResponse ret; | 141 | BackendResponse ret; |
| 142 | AssetMetadata metadata = asset.getMetadata(); | 142 | AssetMetadata metadata = asset.Metadata; |
| 143 | 143 | ||
| 144 | string path; | 144 | string path; |
| 145 | string filename = String.Format("{0}.{1}", asset.FullID, Utils.ContentTypeToExtension(metadata.ContentType)); | 145 | string filename = String.Format("{0}.{1}", asset.FullID, Utils.ContentTypeToExtension(metadata.ContentType)); |