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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-09-06 18:22:09 +02:00
parent ed4ad93fef 041fcd6a72
commit a03ad8bdb4
1 changed files with 13 additions and 6 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,7 +181,8 @@ 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)
@ -218,7 +219,8 @@ 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);
@ -260,7 +262,8 @@ 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)
@ -379,7 +382,9 @@ 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
@ -456,7 +461,8 @@ 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))
@ -471,7 +477,8 @@ 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))