diff options
| author | Melanie Thielker | 2016-12-30 14:33:15 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2016-12-30 14:33:15 +0000 |
| commit | f510898188e7ba54460858a9c934e898b15de2ce (patch) | |
| tree | cf7f538b9faba92d0d6f547b86ea77e2be4568cd /OpenSim | |
| parent | remove a gc.collect that isn't very usefull (on the right engine this (diff) | |
| download | opensim-SC_OLD-f510898188e7ba54460858a9c934e898b15de2ce.zip opensim-SC_OLD-f510898188e7ba54460858a9c934e898b15de2ce.tar.gz opensim-SC_OLD-f510898188e7ba54460858a9c934e898b15de2ce.tar.bz2 opensim-SC_OLD-f510898188e7ba54460858a9c934e898b15de2ce.tar.xz | |
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.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/FSAssetService/FSAssetService.cs | 3 |
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 | |||
| 668 | 668 | ||
| 669 | if (!m_DataConnector.Store(asset.Metadata, hash)) | 669 | if (!m_DataConnector.Store(asset.Metadata, hash)) |
| 670 | { | 670 | { |
| 671 | if (asset.Metadata.Type == -2) | ||
| 672 | return asset.ID; | ||
| 673 | |||
| 671 | return UUID.Zero.ToString(); | 674 | return UUID.Zero.ToString(); |
| 672 | } | 675 | } |
| 673 | else | 676 | else |