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/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 097ad7d..efccc35 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)) { -- cgit v1.1