From 69781810751c64cd8c87009dfa433a5dae3b8b20 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 26 Jan 2018 21:04:46 +0000 Subject: Robust: allow Library assets to override old ones, so they can be updated easily from the xml files keeping same id (left FSAssets out) --- OpenSim/Services/AssetService/AssetService.cs | 2 +- OpenSim/Services/AssetService/XAssetService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Services/AssetService') diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 5c37c33..ee2e568 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs @@ -82,7 +82,7 @@ namespace OpenSim.Services.AssetService if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) { // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); - Store(a); + m_Database.StoreAsset(a); } }); } diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index 9490d55..de7223b 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs @@ -80,7 +80,7 @@ namespace OpenSim.Services.AssetService if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) { // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); - Store(a); + m_Database.StoreAsset(a); } }); } -- cgit v1.1