diff options
| author | onefang | 2021-08-26 06:21:19 +1000 |
|---|---|---|
| committer | onefang | 2021-08-26 06:21:19 +1000 |
| commit | cdfbb899f1112dab44d5490838765e9bd73bc60e (patch) | |
| tree | 52cddd0b76e7ad8544a0ada533f91bb5fc402025 /OpenSim/Services/AssetService | |
| parent | Still failing to reconnect for dbCount(), just set the fucking timeout to a y... (diff) | |
| parent | Don't strip (OWNER) out of script error report. (diff) | |
| download | opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.zip opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.tar.gz opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.tar.bz2 opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.tar.xz | |
Merge branch 'switch' into Domme.
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 | } |