OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Robust: allow Library assets to override old ones, so they can be updated easily from the xml files keeping same id (left FSAssets out)

httptests
UbitUmarov 2018-01-26 21:04:46 +00:00
parent 5e3eb8b370
commit 6978181075
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@ -42,11 +42,13 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
public class AssetLoaderFileSystem : IAssetLoader public class AssetLoaderFileSystem : IAssetLoader
{ {
private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000"); 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); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type) 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)) if (!String.IsNullOrEmpty(path))
{ {

2
OpenSim/Services/AssetService/AssetService.cs
View File

@ -82,7 +82,7 @@ namespace OpenSim.Services.AssetService
if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data))
{ {
// m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID);
Store(a); m_Database.StoreAsset(a);
} }
}); });
} }

2
OpenSim/Services/AssetService/XAssetService.cs
View File

@ -80,7 +80,7 @@ namespace OpenSim.Services.AssetService
if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data))
{ {
// m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID);
Store(a); m_Database.StoreAsset(a);
} }
}); });
} }