diff options
| author | Justin Clark-Casey (justincc) | 2011-08-17 23:24:41 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-17 23:24:41 +0100 |
| commit | 6b51d8a10e44eed7c39b58aab256789ab188ecca (patch) | |
| tree | 8194d49b020d64dbf13315b1500e880a3b30d7c3 /OpenSim/Services/AssetService/AssetService.cs | |
| parent | For now, supress 'OH NOES' warnings given by HGInventoryBroker.CacheInventory... (diff) | |
| download | opensim-SC-6b51d8a10e44eed7c39b58aab256789ab188ecca.zip opensim-SC-6b51d8a10e44eed7c39b58aab256789ab188ecca.tar.gz opensim-SC-6b51d8a10e44eed7c39b58aab256789ab188ecca.tar.bz2 opensim-SC-6b51d8a10e44eed7c39b58aab256789ab188ecca.tar.xz | |
In the asset service, check that an asset exists before attempting to store it.
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index c7a259d..d40aa4b 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
| @@ -174,10 +174,12 @@ namespace OpenSim.Services.AssetService | |||
| 174 | 174 | ||
| 175 | public virtual string Store(AssetBase asset) | 175 | public virtual string Store(AssetBase asset) |
| 176 | { | 176 | { |
| 177 | // m_log.DebugFormat( | 177 | if (!m_Database.ExistsAsset(asset.FullID)) |
| 178 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.ID, asset.Data.Length); | 178 | { |
| 179 | 179 | // m_log.DebugFormat( | |
| 180 | m_Database.StoreAsset(asset); | 180 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length); |
| 181 | m_Database.StoreAsset(asset); | ||
| 182 | } | ||
| 181 | 183 | ||
| 182 | return asset.ID; | 184 | return asset.ID; |
| 183 | } | 185 | } |