Merge branch 'melanie'

This commit is contained in:
Melanie Thielker
2017-02-02 15:34:20 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache != null)
m_Cache.Get(id, out asset);
return null;
return asset;
}
public AssetMetadata GetMetadata(string id)