aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2014-07-04 16:28:37 -0700
committerDiva Canto2014-07-04 16:28:37 -0700
commit869191a51d18571bd049c0e3b18775e63a88f046 (patch)
tree31ed38cd048fdc65183a60712b9c31681a9aff2d
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-869191a51d18571bd049c0e3b18775e63a88f046.zip
opensim-SC_OLD-869191a51d18571bd049c0e3b18775e63a88f046.tar.gz
opensim-SC_OLD-869191a51d18571bd049c0e3b18775e63a88f046.tar.bz2
opensim-SC_OLD-869191a51d18571bd049c0e3b18775e63a88f046.tar.xz
Small change to my previous commit: not so aggressive on the trigger, please.
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs2
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 }