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.

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs
index 7f14462..cddd288 100644
--- a/OpenSim/Services/FSAssetService/FSAssetService.cs
+++ b/OpenSim/Services/FSAssetService/FSAssetService.cs
@@ -668,6 +668,9 @@ namespace OpenSim.Services.FSAssetService
 
             if (!m_DataConnector.Store(asset.Metadata, hash))
             {
+                if (asset.Metadata.Type == -2)
+                    return asset.ID;
+
                 return UUID.Zero.ToString();
             }
             else