ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
root
2011-07-09 01:06:46 +01:00
parent fedfa02b64 e7abf834d1
commit c920ff9d1d
23 changed files with 4291 additions and 4015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,11 +84,20 @@ namespace OpenSim.Services.AssetService
if (assetLoaderEnabled)
{
m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs);
m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs,
delegate(AssetBase a)
m_AssetLoader.ForEachDefaultXmlAsset(
loaderArgs,
delegate(AssetBase a)
{
AssetBase existingAsset = Get(a.ID);
// AssetMetadata existingMetadata = GetMetadata(a.ID);
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_log.Info("[ASSET SERVICE]: Local asset service enabled");