diff options
author | UbitUmarov | 2018-01-26 21:04:46 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-26 21:04:46 +0000 |
commit | 69781810751c64cd8c87009dfa433a5dae3b8b20 (patch) | |
tree | eaffaf17720341a938e96d01cfe0602bb23fd0ad /OpenSim/Services/AssetService | |
parent | Merge branch 'master' into httptests (diff) | |
download | opensim-SC-69781810751c64cd8c87009dfa433a5dae3b8b20.zip opensim-SC-69781810751c64cd8c87009dfa433a5dae3b8b20.tar.gz opensim-SC-69781810751c64cd8c87009dfa433a5dae3b8b20.tar.bz2 opensim-SC-69781810751c64cd8c87009dfa433a5dae3b8b20.tar.xz |
Robust: allow Library assets to override old ones, so they can be updated easily from the xml files keeping same id (left FSAssets out)
Diffstat (limited to 'OpenSim/Services/AssetService')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/AssetService/XAssetService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 5c37c33..ee2e568 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -82,7 +82,7 @@ namespace OpenSim.Services.AssetService | |||
82 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) | 82 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) |
83 | { | 83 | { |
84 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); | 84 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); |
85 | Store(a); | 85 | m_Database.StoreAsset(a); |
86 | } | 86 | } |
87 | }); | 87 | }); |
88 | } | 88 | } |
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index 9490d55..de7223b 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Services.AssetService | |||
80 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) | 80 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) |
81 | { | 81 | { |
82 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); | 82 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); |
83 | Store(a); | 83 | m_Database.StoreAsset(a); |
84 | } | 84 | } |
85 | }); | 85 | }); |
86 | } | 86 | } |