aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs14
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 2a3dacc..45ebf3a 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors
181 181
182 public AssetBase Get(string id) 182 public AssetBase Get(string id)
183 { 183 {
184 string uri = Path.Combine(MapServer(id), Path.Combine("assets", id)); 184 string uri = MapServer(id) + "/assets/" + id;
185 185
186 AssetBase asset = null; 186 AssetBase asset = null;
187 if (m_Cache != null) 187 if (m_Cache != null)
@@ -218,7 +218,7 @@ namespace OpenSim.Services.Connectors
218 return fullAsset.Metadata; 218 return fullAsset.Metadata;
219 } 219 }
220 220
221 string uri = Path.Combine(MapServer(id), Path.Combine("assets", id)); 221 string uri = MapServer(id) + "/assets/" + id + "/metadata";
222 222
223 AssetMetadata asset = SynchronousRestObjectRequester. 223 AssetMetadata asset = SynchronousRestObjectRequester.
224 MakeRequest<int, AssetMetadata>("GET", uri, 0); 224 MakeRequest<int, AssetMetadata>("GET", uri, 0);
@@ -260,7 +260,7 @@ namespace OpenSim.Services.Connectors
260 260
261 public bool Get(string id, Object sender, AssetRetrieved handler) 261 public bool Get(string id, Object sender, AssetRetrieved handler)
262 { 262 {
263 string uri = Path.Combine(MapServer(id), Path.Combine("assets", id)); 263 string uri = MapServer(id) + "/assets/" + id;
264 264
265 AssetBase asset = null; 265 AssetBase asset = null;
266 if (m_Cache != null) 266 if (m_Cache != null)
@@ -379,9 +379,7 @@ namespace OpenSim.Services.Connectors
379 return asset.ID; 379 return asset.ID;
380 } 380 }
381 381
382 string uri = Path.Combine(MapServer(asset.FullID.ToString()), "/assets/"); 382 string uri = MapServer(asset.FullID.ToString()) + "/assets/";
383 if (!uri.EndsWith("/"))
384 uri += "/";
385 383
386 string newID = string.Empty; 384 string newID = string.Empty;
387 try 385 try
@@ -458,7 +456,7 @@ namespace OpenSim.Services.Connectors
458 } 456 }
459 asset.Data = data; 457 asset.Data = data;
460 458
461 string uri = Path.Combine(MapServer(id), Path.Combine("assets", id)); 459 string uri = MapServer(id) + "/assets/" + id;
462 460
463 if (SynchronousRestObjectRequester. 461 if (SynchronousRestObjectRequester.
464 MakeRequest<AssetBase, bool>("POST", uri, asset)) 462 MakeRequest<AssetBase, bool>("POST", uri, asset))
@@ -473,7 +471,7 @@ namespace OpenSim.Services.Connectors
473 471
474 public bool Delete(string id) 472 public bool Delete(string id)
475 { 473 {
476 string uri = Path.Combine(MapServer(id), Path.Combine("assets", id)); 474 string uri = MapServer(id) + "/assets/" + id;
477 475
478 if (SynchronousRestObjectRequester. 476 if (SynchronousRestObjectRequester.
479 MakeRequest<int, bool>("DELETE", uri, 0)) 477 MakeRequest<int, bool>("DELETE", uri, 0))