ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

some changes to getassets module and handler

Browse Source
This commit is contained in:
UbitUmarov
2020-08-09 06:13:35 +01:00
parent a2fe315d94
commit 8d0ef07de8
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs
View File

@@ -77,7 +77,7 @@ namespace OpenSim.Capabilities.Handlers
m_assetService = assService;
}
public void Handle(OSHttpRequest req, OSHttpResponse response)
public void Handle(OSHttpRequest req, OSHttpResponse response, string serviceURL = null)
{
response.ContentType = "text/plain";
@@ -122,11 +122,24 @@ namespace OpenSim.Capabilities.Handlers
return;
AssetBase asset = m_assetService.Get(assetID.ToString());
if(asset == null)
if (asset == null)
{
if (String.IsNullOrWhiteSpace(serviceURL))
{
// m_log.Warn("[GETASSET]: not found: " + query + " " + assetStr);
response.StatusCode = (int)HttpStatusCode.NotFound;
return;
}
string newid = serviceURL + "/" + assetID.ToString();
asset = m_assetService.Get(newid);
if (asset == null)
{
// m_log.Warn("[GETASSET]: not found: " + query + " " + assetStr);
response.StatusCode = (int)HttpStatusCode.NotFound;
return;
}
// m_log.Warn("[GETASSET]: not found: " + query + " " + assetStr);
response.StatusCode = (int)HttpStatusCode.NotFound;
return;
}
if (asset.Type != (sbyte)type)