Fake accepting materials (Type == -2) on FSAssets.

Materials are created with an MD5 hash based UUID in order to
stop proliferation of orphaned assets. Therefore a UUID collision
is expected on materials and should not have been treated as an
error.
melanie
Melanie Thielker 2016-12-30 14:33:15 +00:00
parent 1507c5230b
commit f510898188
1 changed files with 3 additions and 0 deletions

View File

@ -668,6 +668,9 @@ namespace OpenSim.Services.FSAssetService
if (!m_DataConnector.Store(asset.Metadata, hash)) if (!m_DataConnector.Store(asset.Metadata, hash))
{ {
if (asset.Metadata.Type == -2)
return asset.ID;
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
else else