OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert " remove extra '/' in assets url" 

This reverts commit 041fcd6a72.
avinationmerge
Melanie 2012-09-06 17:02:55 +02:00
parent 041fcd6a72
commit 27d345c9a0
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

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