From 27d345c9a0047af44296184557aed25719b2759e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 6 Sep 2012 17:02:55 +0200
Subject: Revert " remove extra '/' in assets url"

This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486.
---
 .../Connectors/Asset/AssetServicesConnector.cs        | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Services')

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
 
         public AssetBase Get(string id)
         {
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = MapServer(id) + "/assets/" + id;
 
             AssetBase asset = null;
             if (m_Cache != null)
@@ -219,8 +218,7 @@ namespace OpenSim.Services.Connectors
                     return fullAsset.Metadata;
             }
 
-//            string uri = MapServer(id) + "/assets/" + id + "/metadata";
-            string uri = MapServer(id) + "assets/" + id + "/metadata";
+            string uri = MapServer(id) + "/assets/" + id + "/metadata";
 
             AssetMetadata asset = SynchronousRestObjectRequester.
                     MakeRequest<int, AssetMetadata>("GET", uri, 0);
@@ -262,8 +260,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Get(string id, Object sender, AssetRetrieved handler)
         {
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = MapServer(id) + "/assets/" + id;
 
             AssetBase asset = null;
             if (m_Cache != null)
@@ -382,9 +379,7 @@ namespace OpenSim.Services.Connectors
                 return asset.ID;
             }
 
-//            string uri = MapServer(asset.FullID.ToString()) + "/assets/";
-
-            string uri = MapServer(asset.FullID.ToString()) + "assets/";
+            string uri = MapServer(asset.FullID.ToString()) + "/assets/";
 
             string newID = string.Empty;
             try
@@ -461,8 +456,7 @@ namespace OpenSim.Services.Connectors
             }
             asset.Data = data;
 
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = MapServer(id) + "/assets/" + id;
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<AssetBase, bool>("POST", uri, asset))
@@ -477,8 +471,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Delete(string id)
         {
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = MapServer(id) + "/assets/" + id;
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<int, bool>("DELETE", uri, 0))
-- 
cgit v1.1