diff options
| author | Diva Canto | 2012-11-04 15:17:47 -0800 |
|---|---|---|
| committer | Melanie | 2012-11-04 23:28:05 +0000 |
| commit | 08b37efc327c8d05394007a7dcb2eb813422fb92 (patch) | |
| tree | 79e706b19f66182c6a9cb6deefee2c41b1bc85aa /OpenSim/Region | |
| parent | Add a method to query all registered script constants to allow non-XEngine (diff) | |
| download | opensim-SC_OLD-08b37efc327c8d05394007a7dcb2eb813422fb92.zip opensim-SC_OLD-08b37efc327c8d05394007a7dcb2eb813422fb92.tar.gz opensim-SC_OLD-08b37efc327c8d05394007a7dcb2eb813422fb92.tar.bz2 opensim-SC_OLD-08b37efc327c8d05394007a7dcb2eb813422fb92.tar.xz | |
Prevent IMs being sent to prims when avies decline inventory offers from them.
Diffstat (limited to 'OpenSim/Region')
| -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 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 | } |