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 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 952b039..2212216 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -36,6 +36,7 @@ using OpenSim.Framework.Console; | |||
36 | using System.IO; | 36 | using System.IO; |
37 | using System.Text; | 37 | using System.Text; |
38 | using System.Xml; | 38 | using System.Xml; |
39 | using OpenSim.Region.Environment.Interfaces; | ||
39 | 40 | ||
40 | 41 | ||
41 | namespace OpenSim.Region.Environment.Scenes | 42 | namespace OpenSim.Region.Environment.Scenes |
@@ -266,8 +267,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
266 | } | 267 | } |
267 | else | 268 | else |
268 | { | 269 | { |
269 | CommsManager.TransactionsManager.HandleItemUpdateFromTransaction( | 270 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); |
270 | remoteClient, transactionID, item); | 271 | if (agentTransactions != null) |
272 | { | ||
273 | agentTransactions.HandleItemUpdateFromTransaction( | ||
274 | remoteClient, transactionID, item); | ||
275 | } | ||
271 | } | 276 | } |
272 | } | 277 | } |
273 | else | 278 | else |
@@ -459,9 +464,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
459 | } | 464 | } |
460 | else | 465 | else |
461 | { | 466 | { |
462 | CommsManager.TransactionsManager.HandleItemCreationFromTransaction( | 467 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); |
468 | if (agentTransactions != null) | ||
469 | { | ||
470 | agentTransactions.HandleItemCreationFromTransaction( | ||
463 | remoteClient, transactionID, folderID, callbackID, description, | 471 | remoteClient, transactionID, folderID, callbackID, description, |
464 | name, invType, assetType, wearableType, nextOwnerMask); | 472 | name, invType, assetType, wearableType, nextOwnerMask); |
473 | } | ||
474 | |||
475 | |||
465 | } | 476 | } |
466 | } | 477 | } |
467 | 478 | ||