diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index ecaab44..e26beec 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -451,16 +451,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
451 | scene.SendInventoryUpdate(client, trashFolder, true, true); | 451 | scene.SendInventoryUpdate(client, trashFolder, true, true); |
452 | } | 452 | } |
453 | 453 | ||
454 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); | 454 | if (im.dialog == (byte)InstantMessageDialog.InventoryDeclined) |
455 | |||
456 | if (user != null) // Local | ||
457 | { | ||
458 | user.ControllingClient.SendInstantMessage(im); | ||
459 | } | ||
460 | else | ||
461 | { | 455 | { |
462 | if (m_TransferModule != null) | 456 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); |
463 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); | 457 | |
458 | if (user != null) // Local | ||
459 | { | ||
460 | user.ControllingClient.SendInstantMessage(im); | ||
461 | } | ||
462 | else | ||
463 | { | ||
464 | if (m_TransferModule != null) | ||
465 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { }); | ||
466 | } | ||
464 | } | 467 | } |
465 | } | 468 | } |
466 | } | 469 | } |