Merge branch 'ubitwork' into avination

1 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 45ebf3a..2a3dacc 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors
 
         public AssetBase Get(string id)
         {
-            string uri = MapServer(id) + "/assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             AssetBase asset = null;
             if (m_Cache != null)
@@ -218,7 +218,7 @@ namespace OpenSim.Services.Connectors
                     return fullAsset.Metadata;
             }
 
-            string uri = MapServer(id) + "/assets/" + id + "/metadata";
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             AssetMetadata asset = SynchronousRestObjectRequester.
                     MakeRequest<int, AssetMetadata>("GET", uri, 0);
@@ -260,7 +260,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Get(string id, Object sender, AssetRetrieved handler)
         {
-            string uri = MapServer(id) + "/assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             AssetBase asset = null;
             if (m_Cache != null)
@@ -379,7 +379,9 @@ namespace OpenSim.Services.Connectors
                 return asset.ID;
             }
 
-            string uri = MapServer(asset.FullID.ToString()) + "/assets/";
+            string uri = Path.Combine(MapServer(asset.FullID.ToString()), "/assets/");
+            if (!uri.EndsWith("/"))
+                uri += "/";
 
             string newID = string.Empty;
             try
@@ -456,7 +458,7 @@ namespace OpenSim.Services.Connectors
             }
             asset.Data = data;
 
-            string uri = MapServer(id) + "/assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<AssetBase, bool>("POST", uri, asset))
@@ -471,7 +473,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Delete(string id)
         {
-            string uri = MapServer(id) + "/assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<int, bool>("DELETE", uri, 0))