Merge branch 'master' of brain.opensimulator.org:/var/git/opensim

This commit is contained in:
Melanie
2019-08-07 17:58:55 +01:00
35 changed files with 824 additions and 515 deletions

View File

@@ -138,8 +138,6 @@ namespace OpenSim.Capabilities.Handlers
if(type == AssetType.Mesh || type == AssetType.Texture)
responsedata["throttle"] = true;
// else
// m_log.Warn("[GETASSETS]: type: " + query);
responsedata["content_type"] = asset.Metadata.ContentType;
responsedata["bin_response_data"] = asset.Data;