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

in some cases store a hg asset on local grid is just waste

Browse Source
This commit is contained in:
UbitUmarov
2020-10-28 12:12:08 +00:00
parent 52c86e543f
commit 7b106564fa
14 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,29 +121,13 @@ namespace OpenSim.Capabilities.Handlers
if(!UUID.TryParse(assetStr, out assetID))
return;
AssetBase asset = m_assetService.Get(assetID.ToString());
if (asset == null)
AssetBase asset = m_assetService.Get(assetID.ToString(), serviceURL, false);
if (asset == null || asset.Type != (sbyte)type)
{
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);
}
if (asset.Type != (sbyte)type)
response.StatusCode = (int)HttpStatusCode.NotFound;
return;
}
int len = asset.Data.Length;