From 69781810751c64cd8c87009dfa433a5dae3b8b20 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 26 Jan 2018 21:04:46 +0000 Subject: [PATCH] Robust: allow Library assets to override old ones, so they can be updated easily from the xml files keeping same id (left FSAssets out) --- .../Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 4 +++- OpenSim/Services/AssetService/AssetService.cs | 2 +- OpenSim/Services/AssetService/XAssetService.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 097ad7d6a3..efccc35080 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs @@ -42,11 +42,13 @@ namespace OpenSim.Framework.AssetLoader.Filesystem public class AssetLoaderFileSystem : IAssetLoader { private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000"); + private static readonly string LIBRARY_OWNER_IDstr = "11111111-1111-0000-0000-000100bba000"; + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type) { - AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID.ToString()); + AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_IDstr); if (!String.IsNullOrEmpty(path)) { diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 5c37c33452..ee2e56871f 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 9490d55af2..de7223ba4d 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); } }); }