diff options
| author | Melanie Thielker | 2014-09-25 21:21:20 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-09-25 21:21:20 +0200 |
| commit | 3a42ea52792438b44c6ddbd17eaad93c32263bbb (patch) | |
| tree | ce46f79f2d75aa9c8dc48310da416415a0d8bd6d /OpenSim/Region/CoreModules/Agent | |
| parent | fix animation asset name to "animatn", use "animset" for the new (diff) | |
| download | opensim-SC_OLD-3a42ea52792438b44c6ddbd17eaad93c32263bbb.zip opensim-SC_OLD-3a42ea52792438b44c6ddbd17eaad93c32263bbb.tar.gz opensim-SC_OLD-3a42ea52792438b44c6ddbd17eaad93c32263bbb.tar.bz2 opensim-SC_OLD-3a42ea52792438b44c6ddbd17eaad93c32263bbb.tar.xz | |
Extend upload verification to all upload paths
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index ffff37d..0569836 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
| @@ -391,6 +391,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 391 | // "[ASSET XFER UPLOADER]: Storing asset {0} for earlier item update for {1} for {2}", | 391 | // "[ASSET XFER UPLOADER]: Storing asset {0} for earlier item update for {1} for {2}", |
| 392 | // m_asset.FullID, item.Name, ourClient.Name); | 392 | // m_asset.FullID, item.Name, ourClient.Name); |
| 393 | 393 | ||
| 394 | ValidateAssets(); | ||
| 394 | m_Scene.AssetService.Store(m_asset); | 395 | m_Scene.AssetService.Store(m_asset); |
| 395 | if (m_asset.FullID != UUID.Zero) | 396 | if (m_asset.FullID != UUID.Zero) |
| 396 | { | 397 | { |
| @@ -411,6 +412,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 411 | // "[ASSET XFER UPLOADER]: Storing asset {0} for earlier task item update for {1} for {2}", | 412 | // "[ASSET XFER UPLOADER]: Storing asset {0} for earlier task item update for {1} for {2}", |
| 412 | // m_asset.FullID, taskItem.Name, ourClient.Name); | 413 | // m_asset.FullID, taskItem.Name, ourClient.Name); |
| 413 | 414 | ||
| 415 | ValidateAssets(); | ||
| 414 | m_Scene.AssetService.Store(m_asset); | 416 | m_Scene.AssetService.Store(m_asset); |
| 415 | 417 | ||
| 416 | m_transactions.RemoveXferUploader(m_transactionID); | 418 | m_transactions.RemoveXferUploader(m_transactionID); |