diff options
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 270b01b..e1281a6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -435,10 +435,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
435 | } | 435 | } |
436 | else | 436 | else |
437 | { | 437 | { |
438 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); | 438 | if (AgentTransactionsModule != null) |
439 | if (agentTransactions != null) | ||
440 | { | 439 | { |
441 | agentTransactions.HandleItemUpdateFromTransaction(remoteClient, transactionID, item); | 440 | AgentTransactionsModule.HandleItemUpdateFromTransaction(remoteClient, transactionID, item); |
442 | } | 441 | } |
443 | } | 442 | } |
444 | } | 443 | } |
@@ -1566,21 +1565,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
1566 | // Only look for an uploaded updated asset if we are passed a transaction ID. This is only the | 1565 | // Only look for an uploaded updated asset if we are passed a transaction ID. This is only the |
1567 | // case for updates uploded through UDP. Updates uploaded via a capability (e.g. a script update) | 1566 | // case for updates uploded through UDP. Updates uploaded via a capability (e.g. a script update) |
1568 | // will not pass in a transaction ID in the update message. | 1567 | // will not pass in a transaction ID in the update message. |
1569 | if (transactionID != UUID.Zero) | 1568 | if (transactionID != UUID.Zero && AgentTransactionsModule != null) |
1570 | { | 1569 | { |
1571 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); | 1570 | AgentTransactionsModule.HandleTaskItemUpdateFromTransaction( |
1572 | if (agentTransactions != null) | 1571 | remoteClient, part, transactionID, currentItem); |
1573 | { | 1572 | |
1574 | agentTransactions.HandleTaskItemUpdateFromTransaction( | 1573 | // if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) |
1575 | remoteClient, part, transactionID, currentItem); | 1574 | // remoteClient.SendAgentAlertMessage("Notecard saved", false); |
1576 | 1575 | // else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) | |
1577 | // if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) | 1576 | // remoteClient.SendAgentAlertMessage("Script saved", false); |
1578 | // remoteClient.SendAgentAlertMessage("Notecard saved", false); | 1577 | // else |
1579 | // else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) | 1578 | // remoteClient.SendAgentAlertMessage("Item saved", false); |
1580 | // remoteClient.SendAgentAlertMessage("Script saved", false); | ||
1581 | // else | ||
1582 | // remoteClient.SendAgentAlertMessage("Item saved", false); | ||
1583 | } | ||
1584 | } | 1579 | } |
1585 | 1580 | ||
1586 | // Base ALWAYS has move | 1581 | // Base ALWAYS has move |