aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetInventoryServer
diff options
context:
space:
mode:
authorMike Mazur2009-03-13 05:58:32 +0000
committerMike Mazur2009-03-13 05:58:32 +0000
commit4a21d926684f013aaaa1c349d3d1c11f3d614381 (patch)
tree47d74d29d5e11ffa5e7337071d129b8388ea6ffe /OpenSim/Grid/AssetInventoryServer
parent* Don't fail the client login if there are no OnClientConnect listeners (diff)
downloadopensim-SC_OLD-4a21d926684f013aaaa1c349d3d1c11f3d614381.zip
opensim-SC_OLD-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.gz
opensim-SC_OLD-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.bz2
opensim-SC_OLD-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.xz
Mark AssetBase.Metadata with [XmlIgnore]
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
index 4b0dd7f..0631ee7 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
62 if (asset == null) ret = BackendResponse.NotFound; 62 if (asset == null) ret = BackendResponse.NotFound;
63 else 63 else
64 { 64 {
65 metadata = asset.getMetadata(); 65 metadata = asset.Metadata;
66 ret = BackendResponse.Success; 66 ret = BackendResponse.Success;
67 } 67 }
68 68
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));