diff options
| author | dahlia | 2013-06-28 14:03:46 -0700 |
|---|---|---|
| committer | dahlia | 2013-06-28 14:03:46 -0700 |
| commit | 4cb4c9fb25f15d05c269e1796571795e46b7074e (patch) | |
| tree | 820d89c1afdbd987b66f4b37013e72e493ba8b6e /OpenSim/Services/AssetService | |
| parent | add some locking to materials storage dictionary (diff) | |
| parent | Remove "Asset deletion not supported by database" message from "delete asset"... (diff) | |
| download | opensim-SC-4cb4c9fb25f15d05c269e1796571795e46b7074e.zip opensim-SC-4cb4c9fb25f15d05c269e1796571795e46b7074e.tar.gz opensim-SC-4cb4c9fb25f15d05c269e1796571795e46b7074e.tar.bz2 opensim-SC-4cb4c9fb25f15d05c269e1796571795e46b7074e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/AssetService')
| -rw-r--r-- | OpenSim/Services/AssetService/XAssetService.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index 8a2ca7c..6047616 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs | |||
| @@ -205,15 +205,16 @@ namespace OpenSim.Services.AssetService | |||
| 205 | if (!UUID.TryParse(id, out assetID)) | 205 | if (!UUID.TryParse(id, out assetID)) |
| 206 | return false; | 206 | return false; |
| 207 | 207 | ||
| 208 | // Don't bother deleting from a chained asset service. This isn't a big deal since deleting happens | 208 | if (HasChainedAssetService) |
| 209 | // very rarely. | 209 | m_ChainedAssetService.Delete(id); |
| 210 | 210 | ||
| 211 | return m_Database.Delete(id); | 211 | return m_Database.Delete(id); |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | private void MigrateFromChainedService(AssetBase asset) | 214 | private void MigrateFromChainedService(AssetBase asset) |
| 215 | { | 215 | { |
| 216 | Util.FireAndForget(o => { Store(asset); m_ChainedAssetService.Delete(asset.ID); }); | 216 | Store(asset); |
| 217 | m_ChainedAssetService.Delete(asset.ID); | ||
| 217 | } | 218 | } |
| 218 | } | 219 | } |
| 219 | } \ No newline at end of file | 220 | } \ No newline at end of file |