aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService
diff options
context:
space:
mode:
authordiva2009-05-18 20:04:59 +0000
committerdiva2009-05-18 20:04:59 +0000
commit13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648 (patch)
treedea1efaaed83e83e3d262d455e107d0bb3edbfb4 /OpenSim/Services/AssetService
parent* minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191 (diff)
downloadopensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.zip
opensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.tar.gz
opensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.tar.bz2
opensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.tar.xz
Finished HG Service Store. Not fully functional because of problems with asset.ID insisting on being a UUID string.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/AssetService/HGAssetService.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Services/AssetService/HGAssetService.cs b/OpenSim/Services/AssetService/HGAssetService.cs
index 415a0f5..cf275ab 100644
--- a/OpenSim/Services/AssetService/HGAssetService.cs
+++ b/OpenSim/Services/AssetService/HGAssetService.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Services.AssetService
94 // We're instantiating this class explicitly, but this won't 94 // We're instantiating this class explicitly, but this won't
95 // work in general, because the remote grid may be running 95 // work in general, because the remote grid may be running
96 // an asset server that has a different protocol. 96 // an asset server that has a different protocol.
97 // Eventually we will want a piece of meta-protocol asking 97 // Eventually we will want a piece of protocol asking
98 // the remote server about its kind. Definitely cool thing to do! 98 // the remote server about its kind. Definitely cool thing to do!
99 connector = new AssetServicesConnector(url); 99 connector = new AssetServicesConnector(url);
100 m_connectors.Add(url, connector); 100 m_connectors.Add(url, connector);
@@ -152,6 +152,17 @@ namespace OpenSim.Services.AssetService
152 152
153 public string Store(AssetBase asset) 153 public string Store(AssetBase asset)
154 { 154 {
155 string url = string.Empty;
156 string assetID = string.Empty;
157
158 if (StringToUrlAndAssetID(asset.ID, out url, out assetID))
159 {
160 IAssetService connector = GetConnector(url);
161 // Restore the assetID to a simple UUID
162 asset.ID = assetID;
163 return connector.Store(asset);
164 }
165
155 return String.Empty; 166 return String.Empty;
156 } 167 }
157 168