diff options
author | Justin Clark-Casey (justincc) | 2012-06-07 23:51:04 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-07 23:51:04 +0100 |
commit | 0c5fefacb415fb916ffece839c95c155ec718254 (patch) | |
tree | ca263bcd51dbe444b08ffaf7b6ea15c1c0bf2557 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Don't send kill object messages to clients when a child agent is closed. (diff) | |
download | opensim-SC-0c5fefacb415fb916ffece839c95c155ec718254.zip opensim-SC-0c5fefacb415fb916ffece839c95c155ec718254.tar.gz opensim-SC-0c5fefacb415fb916ffece839c95c155ec718254.tar.bz2 opensim-SC-0c5fefacb415fb916ffece839c95c155ec718254.tar.xz |
Record the fact that child agents can have asset transactions.
Also change code to grab the agent asset transaction module once.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 79c9309..b59fd05 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -440,10 +440,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
440 | } | 440 | } |
441 | else | 441 | else |
442 | { | 442 | { |
443 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); | 443 | if (AgentTransactionsModule != null) |
444 | if (agentTransactions != null) | ||
445 | { | 444 | { |
446 | agentTransactions.HandleItemUpdateFromTransaction(remoteClient, transactionID, item); | 445 | AgentTransactionsModule.HandleItemUpdateFromTransaction(remoteClient, transactionID, item); |
447 | } | 446 | } |
448 | } | 447 | } |
449 | } | 448 | } |
@@ -1532,21 +1531,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
1532 | // Only look for an uploaded updated asset if we are passed a transaction ID. This is only the | 1531 | // Only look for an uploaded updated asset if we are passed a transaction ID. This is only the |
1533 | // case for updates uploded through UDP. Updates uploaded via a capability (e.g. a script update) | 1532 | // case for updates uploded through UDP. Updates uploaded via a capability (e.g. a script update) |
1534 | // will not pass in a transaction ID in the update message. | 1533 | // will not pass in a transaction ID in the update message. |
1535 | if (transactionID != UUID.Zero) | 1534 | if (transactionID != UUID.Zero && AgentTransactionsModule != null) |
1536 | { | 1535 | { |
1537 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); | 1536 | AgentTransactionsModule.HandleTaskItemUpdateFromTransaction( |
1538 | if (agentTransactions != null) | 1537 | remoteClient, part, transactionID, currentItem); |
1539 | { | 1538 | |
1540 | agentTransactions.HandleTaskItemUpdateFromTransaction( | 1539 | if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) |
1541 | remoteClient, part, transactionID, currentItem); | 1540 | remoteClient.SendAgentAlertMessage("Notecard saved", false); |
1542 | 1541 | else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) | |
1543 | if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) | 1542 | remoteClient.SendAgentAlertMessage("Script saved", false); |
1544 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | 1543 | else |
1545 | else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) | 1544 | remoteClient.SendAgentAlertMessage("Item saved", false); |
1546 | remoteClient.SendAgentAlertMessage("Script saved", false); | ||
1547 | else | ||
1548 | remoteClient.SendAgentAlertMessage("Item saved", false); | ||
1549 | } | ||
1550 | } | 1545 | } |
1551 | 1546 | ||
1552 | // Base ALWAYS has move | 1547 | // Base ALWAYS has move |