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

Merge branch 'ubitwork' into avination

avinationmerge
Melanie 2012-09-06 17:12:42 +02:00
parent 9ae293881a b9d026666d
commit 012f299052
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors
public AssetBase Get(string id) public AssetBase Get(string id)
{ {
string uri = MapServer(id) + "/assets/" + id; string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
AssetBase asset = null; AssetBase asset = null;
if (m_Cache != null) if (m_Cache != null)
@ -218,7 +218,7 @@ namespace OpenSim.Services.Connectors
return fullAsset.Metadata; return fullAsset.Metadata;
} }
string uri = MapServer(id) + "/assets/" + id + "/metadata"; string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
AssetMetadata asset = SynchronousRestObjectRequester. AssetMetadata asset = SynchronousRestObjectRequester.
MakeRequest<int, AssetMetadata>("GET", uri, 0); MakeRequest<int, AssetMetadata>("GET", uri, 0);
@ -260,7 +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 = Path.Combine(MapServer(id), Path.Combine("assets", id));
AssetBase asset = null; AssetBase asset = null;
if (m_Cache != null) if (m_Cache != null)
@ -379,7 +379,9 @@ namespace OpenSim.Services.Connectors
return asset.ID; 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; string newID = string.Empty;
try try
@ -456,7 +458,7 @@ namespace OpenSim.Services.Connectors
} }
asset.Data = data; asset.Data = data;
string uri = MapServer(id) + "/assets/" + id; string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
if (SynchronousRestObjectRequester. if (SynchronousRestObjectRequester.
MakeRequest<AssetBase, bool>("POST", uri, asset)) MakeRequest<AssetBase, bool>("POST", uri, asset))
@ -471,7 +473,7 @@ namespace OpenSim.Services.Connectors
public bool Delete(string id) public bool Delete(string id)
{ {
string uri = MapServer(id) + "/assets/" + id; string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
if (SynchronousRestObjectRequester. if (SynchronousRestObjectRequester.
MakeRequest<int, bool>("DELETE", uri, 0)) MakeRequest<int, bool>("DELETE", uri, 0))