diff options
Moved the AgentAssetTransactionsManager (and AgentAssetTransactions) out of CommsManager and into a module (AgentAgentTransactionModule), still needs cleaning up though.
But its one more thing out of the CommsManager. One day we will kill the CommsManager!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index b534b4d..d3b051f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1397,8 +1397,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1397 | client.OnUpdateInventoryItem += UpdateInventoryItemAsset; | 1397 | client.OnUpdateInventoryItem += UpdateInventoryItemAsset; |
1398 | client.OnCopyInventoryItem += CopyInventoryItem; | 1398 | client.OnCopyInventoryItem += CopyInventoryItem; |
1399 | client.OnMoveInventoryItem += MoveInventoryItem; | 1399 | client.OnMoveInventoryItem += MoveInventoryItem; |
1400 | client.OnAssetUploadRequest += CommsManager.TransactionsManager.HandleUDPUploadRequest; | 1400 | // client.OnAssetUploadRequest += CommsManager.TransactionsManager.HandleUDPUploadRequest; |
1401 | client.OnXferReceive += CommsManager.TransactionsManager.HandleXfer; | 1401 | // client.OnXferReceive += CommsManager.TransactionsManager.HandleXfer; |
1402 | client.OnRezScript += RezScript; | 1402 | client.OnRezScript += RezScript; |
1403 | 1403 | ||
1404 | client.OnRequestTaskInventory += RequestTaskInventory; | 1404 | client.OnRequestTaskInventory += RequestTaskInventory; |
@@ -1489,8 +1489,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1489 | 1489 | ||
1490 | ForEachScenePresence( | 1490 | ForEachScenePresence( |
1491 | delegate(ScenePresence presence) { presence.CoarseLocationChange(); }); | 1491 | delegate(ScenePresence presence) { presence.CoarseLocationChange(); }); |
1492 | 1492 | ||
1493 | CommsManager.TransactionsManager.RemoveAgentAssetTransactions(agentID); | 1493 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); |
1494 | if (agentTransactions != null) | ||
1495 | { | ||
1496 | agentTransactions.RemoveAgentAssetTransactions(agentID); | ||
1497 | } | ||
1494 | 1498 | ||
1495 | lock (m_scenePresences) | 1499 | lock (m_scenePresences) |
1496 | { | 1500 | { |