diff options
author | Melanie | 2010-11-05 15:24:08 +0100 |
---|---|---|
committer | Melanie | 2010-11-05 15:24:08 +0100 |
commit | 4db60a5a40580bf5aa56d80c319534e2e312a306 (patch) | |
tree | 149ac76df9fb4785269c57c4923551dc8902da59 /OpenSim/Region | |
parent | Fix merge artefacts (diff) | |
download | opensim-SC-4db60a5a40580bf5aa56d80c319534e2e312a306.zip opensim-SC-4db60a5a40580bf5aa56d80c319534e2e312a306.tar.gz opensim-SC-4db60a5a40580bf5aa56d80c319534e2e312a306.tar.bz2 opensim-SC-4db60a5a40580bf5aa56d80c319534e2e312a306.tar.xz |
Fix the inventory transfer module to not cause duplicated text IMs
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index e9e7c25..528bc8d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -473,10 +473,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
473 | user.ControllingClient.SendBulkUpdateInventory(item); | 473 | user.ControllingClient.SendBulkUpdateInventory(item); |
474 | } | 474 | } |
475 | } | 475 | } |
476 | user.ControllingClient.SendInstantMessage(im); | ||
477 | } | ||
478 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted || | ||
479 | im.dialog == (byte) InstantMessageDialog.InventoryDeclined) | ||
480 | { | ||
481 | user.ControllingClient.SendInstantMessage(im); | ||
476 | } | 482 | } |
477 | |||
478 | // Just forward to the client | ||
479 | user.ControllingClient.SendInstantMessage(im); | ||
480 | } | 483 | } |
481 | } | 484 | } |
482 | } | 485 | } |