diff options
author | Diva Canto | 2012-11-04 15:17:47 -0800 |
---|---|---|
committer | Diva Canto | 2012-11-04 15:17:47 -0800 |
commit | 89322aaf9424ea9ef58d8a91f34f7856ce597e9b (patch) | |
tree | 44058f1913d59ba316358e45ee25102b30b4f6b4 /OpenSim/Region/CoreModules/Avatar | |
parent | Add a method to query all registered script constants to allow non-XEngine (diff) | |
download | opensim-SC_OLD-89322aaf9424ea9ef58d8a91f34f7856ce597e9b.zip opensim-SC_OLD-89322aaf9424ea9ef58d8a91f34f7856ce597e9b.tar.gz opensim-SC_OLD-89322aaf9424ea9ef58d8a91f34f7856ce597e9b.tar.bz2 opensim-SC_OLD-89322aaf9424ea9ef58d8a91f34f7856ce597e9b.tar.xz |
Prevent IMs being sent to prims when avies decline inventory offers from them.
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 8ff20dd..e200775 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -434,16 +434,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
434 | scene.SendInventoryUpdate(client, trashFolder, true, true); | 434 | scene.SendInventoryUpdate(client, trashFolder, true, true); |
435 | } | 435 | } |
436 | 436 | ||
437 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); | 437 | if (im.dialog == (byte)InstantMessageDialog.InventoryDeclined) |
438 | |||
439 | if (user != null) // Local | ||
440 | { | ||
441 | user.ControllingClient.SendInstantMessage(im); | ||
442 | } | ||
443 | else | ||
444 | { | 438 | { |
445 | if (m_TransferModule != null) | 439 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); |
446 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); | 440 | |
441 | if (user != null) // Local | ||
442 | { | ||
443 | user.ControllingClient.SendInstantMessage(im); | ||
444 | } | ||
445 | else | ||
446 | { | ||
447 | if (m_TransferModule != null) | ||
448 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { }); | ||
449 | } | ||
447 | } | 450 | } |
448 | } | 451 | } |
449 | } | 452 | } |