aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService
diff options
context:
space:
mode:
authorroot2011-07-09 01:06:46 +0100
committerroot2011-07-09 01:06:46 +0100
commitc920ff9d1d5840fb6b36efd46e8bec431cc5d15f (patch)
tree4b804cf4255f4a8eaa2789cce97154a418f6e0b5 /OpenSim/Services/AssetService
parentRemove another core SNAFU. AbsolutePosition is NOT equal to group position (diff)
parentInstance-types-in-list fix for LSL/OSSL functions. This will fix llListFindLi... (diff)
downloadopensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.zip
opensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.gz
opensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.bz2
opensim-SC_OLD-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/AssetService')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 005051a..ffdaa60 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -84,11 +84,20 @@ namespace OpenSim.Services.AssetService
84 if (assetLoaderEnabled) 84 if (assetLoaderEnabled)
85 { 85 {
86 m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); 86 m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs);
87 m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs, 87
88 delegate(AssetBase a) 88 m_AssetLoader.ForEachDefaultXmlAsset(
89 loaderArgs,
90 delegate(AssetBase a)
91 {
92 AssetBase existingAsset = Get(a.ID);
93// AssetMetadata existingMetadata = GetMetadata(a.ID);
94
95 if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data))
89 { 96 {
97// m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID);
90 Store(a); 98 Store(a);
91 }); 99 }
100 });
92 } 101 }
93 102
94 m_log.Info("[ASSET SERVICE]: Local asset service enabled"); 103 m_log.Info("[ASSET SERVICE]: Local asset service enabled");