Merge branch 'master' into careminster-presence-refactor

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
                     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");