aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
diff options
context:
space:
mode:
authorDiva Canto2014-07-04 15:56:09 -0700
committerDiva Canto2014-07-04 15:56:09 -0700
commit78c155cd129824dfb651127f37786404a5ecfed6 (patch)
treee3af9130f0416ea5ce962253cf1e4c50bf652ea5 /OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
parentOn logout, delay the removal of AgentCircuitData until the very end, because ... (diff)
downloadopensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.zip
opensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.tar.gz
opensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.tar.bz2
opensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.tar.xz
Instrument the UDP path of creating assets so that it triggers an asset post for users with different asset servers
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 5e772e6..c598748 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -31,6 +31,7 @@ using System.Reflection;
31using log4net; 31using log4net;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
36using PermissionMask = OpenSim.Framework.PermissionMask; 37using PermissionMask = OpenSim.Framework.PermissionMask;
@@ -376,6 +377,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
376 m_Scene.AssetService.Store(m_asset); 377 m_Scene.AssetService.Store(m_asset);
377 378
378 m_transactions.RemoveXferUploader(m_transactionID); 379 m_transactions.RemoveXferUploader(m_transactionID);
380
381 m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(ourClient.AgentId, (AssetType)type, m_asset.FullID, m_asset.Name, 0);
379 } 382 }
380 383
381 /// <summary> 384 /// <summary>
@@ -421,6 +424,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
421 ourClient.SendAlertMessage("Unable to create inventory item"); 424 ourClient.SendAlertMessage("Unable to create inventory item");
422 425
423 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);
424 } 429 }
430
425 } 431 }
426} \ No newline at end of file 432} \ No newline at end of file