aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs21
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 c14cb17..8176989 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -409,16 +409,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
409 "received inventory" + reason, false); 409 "received inventory" + reason, false);
410 } 410 }
411 411
412 ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); 412 if (im.dialog == (byte)InstantMessageDialog.InventoryDeclined)
413
414 if (user != null) // Local
415 {
416 user.ControllingClient.SendInstantMessage(im);
417 }
418 else
419 { 413 {
420 if (m_TransferModule != null) 414 ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
421 m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); 415
416 if (user != null) // Local
417 {
418 user.ControllingClient.SendInstantMessage(im);
419 }
420 else
421 {
422 if (m_TransferModule != null)
423 m_TransferModule.SendInstantMessage(im, delegate(bool success) { });
424 }
422 } 425 }
423 } 426 }
424 } 427 }