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