From f510898188e7ba54460858a9c934e898b15de2ce Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 30 Dec 2016 14:33:15 +0000
Subject: 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.

---
 OpenSim/Services/FSAssetService/FSAssetService.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Services')

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
-- 
cgit v1.1