diff options
| author | Diva Canto | 2014-07-04 16:28:37 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-07-04 16:28:37 -0700 |
| commit | 869191a51d18571bd049c0e3b18775e63a88f046 (patch) | |
| tree | 31ed38cd048fdc65183a60712b9c31681a9aff2d /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-869191a51d18571bd049c0e3b18775e63a88f046.zip opensim-SC-869191a51d18571bd049c0e3b18775e63a88f046.tar.gz opensim-SC-869191a51d18571bd049c0e3b18775e63a88f046.tar.bz2 opensim-SC-869191a51d18571bd049c0e3b18775e63a88f046.tar.xz | |
Small change to my previous commit: not so aggressive on the trigger, please.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index c598748..49a96f4 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
| @@ -424,8 +424,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 424 | ourClient.SendAlertMessage("Unable to create inventory item"); | 424 | ourClient.SendAlertMessage("Unable to create inventory item"); |
| 425 | 425 | ||
| 426 | m_transactions.RemoveXferUploader(m_transactionID); | 426 | m_transactions.RemoveXferUploader(m_transactionID); |
| 427 | |||
| 428 | m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(ourClient.AgentId, (AssetType)type, m_asset.FullID, m_asset.Name, 0); | ||
| 429 | } | 427 | } |
| 430 | 428 | ||
| 431 | } | 429 | } |