diff options
| author | Melanie | 2013-02-27 18:19:38 +0100 |
|---|---|---|
| committer | Melanie | 2013-02-27 18:19:38 +0100 |
| commit | 698363990b1acc8d700fca3a9c9f834cd35dd486 (patch) | |
| tree | 1c55c555779925e52f8d83fe059c0f69ecf60ad8 /OpenSim/Region/CoreModules | |
| parent | Remove osParseJSONNew because it's "object" return type is not useful for LSL (diff) | |
| download | opensim-SC-698363990b1acc8d700fca3a9c9f834cd35dd486.zip opensim-SC-698363990b1acc8d700fca3a9c9f834cd35dd486.tar.gz opensim-SC-698363990b1acc8d700fca3a9c9f834cd35dd486.tar.bz2 opensim-SC-698363990b1acc8d700fca3a9c9f834cd35dd486.tar.xz | |
Try to update inventory items when there is a valid asset - may fix temp textures
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 43b8b44..d94ac05 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
| @@ -391,6 +391,11 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 391 | // m_asset.FullID, item.Name, ourClient.Name); | 391 | // m_asset.FullID, item.Name, ourClient.Name); |
| 392 | 392 | ||
| 393 | m_Scene.AssetService.Store(m_asset); | 393 | m_Scene.AssetService.Store(m_asset); |
| 394 | if (m_asset.FullID != UUID.Zero) | ||
| 395 | { | ||
| 396 | item.AssetID = m_asset.FullID; | ||
| 397 | m_Scene.InventoryService.UpdateItem(item); | ||
| 398 | } | ||
| 394 | 399 | ||
| 395 | m_transactions.RemoveXferUploader(m_transactionID); | 400 | m_transactions.RemoveXferUploader(m_transactionID); |
| 396 | } | 401 | } |