Merge branch 'master' into careminster

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
                     scene.SendInventoryUpdate(client, trashFolder, true, true);
                 }
 
-                ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
-
-                if (user != null) // Local
-                {
-                    user.ControllingClient.SendInstantMessage(im);
-                }
-                else
+                if (im.dialog == (byte)InstantMessageDialog.InventoryDeclined)
                 {
-                    if (m_TransferModule != null)
-                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
+                    ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
+
+                    if (user != null) // Local
+                    {
+                        user.ControllingClient.SendInstantMessage(im);
+                    }
+                    else
+                    {
+                        if (m_TransferModule != null)
+                            m_TransferModule.SendInstantMessage(im, delegate(bool success) { });
+                    }
                 }
             }
         }