diff options
author | Melanie | 2012-09-06 17:02:55 +0200 |
---|---|---|
committer | Melanie | 2012-09-06 17:02:55 +0200 |
commit | 27d345c9a0047af44296184557aed25719b2759e (patch) | |
tree | 596ef1c932a4cef43e8a622ef3a6a6081cef73a5 /OpenSim/Services/Connectors | |
parent | remove extra '/' in assets url (diff) | |
download | opensim-SC_OLD-27d345c9a0047af44296184557aed25719b2759e.zip opensim-SC_OLD-27d345c9a0047af44296184557aed25719b2759e.tar.gz opensim-SC_OLD-27d345c9a0047af44296184557aed25719b2759e.tar.bz2 opensim-SC_OLD-27d345c9a0047af44296184557aed25719b2759e.tar.xz |
Revert " remove extra '/' in assets url"
This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index 7ad6f0b..45ebf3a 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -181,8 +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 = MapServer(id) + "/assets/" + id; | 184 | string uri = MapServer(id) + "/assets/" + id; |
185 | string uri = MapServer(id) + "assets/" + id; | ||
186 | 185 | ||
187 | AssetBase asset = null; | 186 | AssetBase asset = null; |
188 | if (m_Cache != null) | 187 | if (m_Cache != null) |
@@ -219,8 +218,7 @@ namespace OpenSim.Services.Connectors | |||
219 | return fullAsset.Metadata; | 218 | return fullAsset.Metadata; |
220 | } | 219 | } |
221 | 220 | ||
222 | // string uri = MapServer(id) + "/assets/" + id + "/metadata"; | 221 | string uri = MapServer(id) + "/assets/" + id + "/metadata"; |
223 | string uri = MapServer(id) + "assets/" + id + "/metadata"; | ||
224 | 222 | ||
225 | AssetMetadata asset = SynchronousRestObjectRequester. | 223 | AssetMetadata asset = SynchronousRestObjectRequester. |
226 | MakeRequest<int, AssetMetadata>("GET", uri, 0); | 224 | MakeRequest<int, AssetMetadata>("GET", uri, 0); |
@@ -262,8 +260,7 @@ namespace OpenSim.Services.Connectors | |||
262 | 260 | ||
263 | public bool Get(string id, Object sender, AssetRetrieved handler) | 261 | public bool Get(string id, Object sender, AssetRetrieved handler) |
264 | { | 262 | { |
265 | // string uri = MapServer(id) + "/assets/" + id; | 263 | string uri = MapServer(id) + "/assets/" + id; |
266 | string uri = MapServer(id) + "assets/" + id; | ||
267 | 264 | ||
268 | AssetBase asset = null; | 265 | AssetBase asset = null; |
269 | if (m_Cache != null) | 266 | if (m_Cache != null) |
@@ -382,9 +379,7 @@ namespace OpenSim.Services.Connectors | |||
382 | return asset.ID; | 379 | return asset.ID; |
383 | } | 380 | } |
384 | 381 | ||
385 | // string uri = MapServer(asset.FullID.ToString()) + "/assets/"; | 382 | string uri = MapServer(asset.FullID.ToString()) + "/assets/"; |
386 | |||
387 | string uri = MapServer(asset.FullID.ToString()) + "assets/"; | ||
388 | 383 | ||
389 | string newID = string.Empty; | 384 | string newID = string.Empty; |
390 | try | 385 | try |
@@ -461,8 +456,7 @@ namespace OpenSim.Services.Connectors | |||
461 | } | 456 | } |
462 | asset.Data = data; | 457 | asset.Data = data; |
463 | 458 | ||
464 | // string uri = MapServer(id) + "/assets/" + id; | 459 | string uri = MapServer(id) + "/assets/" + id; |
465 | string uri = MapServer(id) + "assets/" + id; | ||
466 | 460 | ||
467 | if (SynchronousRestObjectRequester. | 461 | if (SynchronousRestObjectRequester. |
468 | MakeRequest<AssetBase, bool>("POST", uri, asset)) | 462 | MakeRequest<AssetBase, bool>("POST", uri, asset)) |
@@ -477,8 +471,7 @@ namespace OpenSim.Services.Connectors | |||
477 | 471 | ||
478 | public bool Delete(string id) | 472 | public bool Delete(string id) |
479 | { | 473 | { |
480 | // string uri = MapServer(id) + "/assets/" + id; | 474 | string uri = MapServer(id) + "/assets/" + id; |
481 | string uri = MapServer(id) + "assets/" + id; | ||
482 | 475 | ||
483 | if (SynchronousRestObjectRequester. | 476 | if (SynchronousRestObjectRequester. |
484 | MakeRequest<int, bool>("DELETE", uri, 0)) | 477 | MakeRequest<int, bool>("DELETE", uri, 0)) |