diff options
| author | Melanie Thielker | 2008-11-09 01:16:42 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-09 01:16:42 +0000 |
| commit | bdf9add8d1191b08bdaa9706484ac5da1f91af52 (patch) | |
| tree | ae0a9c0ffb4dabd78a7286a73423a2c6dc4e0e2b /OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer | |
| parent | Mantis#2591. Thank you kindly, Ruud Lathrop for a patch that: (diff) | |
| download | opensim-SC-bdf9add8d1191b08bdaa9706484ac5da1f91af52.zip opensim-SC-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.gz opensim-SC-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.bz2 opensim-SC-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.xz | |
Reintroduce transactionID to the parameter list for SendInstantMessage.
It is required by group IM and also for a proper implementation of item
give, group notice attachments and offline IM.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index d8b203f..b134591 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
| @@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
| 136 | 136 | ||
| 137 | user.ControllingClient.SendInstantMessage( | 137 | user.ControllingClient.SendInstantMessage( |
| 138 | fromAgentID, message, toAgentID, fromAgentName, | 138 | fromAgentID, message, toAgentID, fromAgentName, |
| 139 | dialog, timestamp, false, binaryBucket); | 139 | dialog, timestamp, UUID.Zero, false, binaryBucket); |
| 140 | 140 | ||
| 141 | return; | 141 | return; |
| 142 | } | 142 | } |
| @@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
| 168 | { | 168 | { |
| 169 | user.ControllingClient.SendInstantMessage( | 169 | user.ControllingClient.SendInstantMessage( |
| 170 | fromAgentID, message, toAgentID, fromAgentName, | 170 | fromAgentID, message, toAgentID, fromAgentName, |
| 171 | dialog, timestamp, false, binaryBucket); | 171 | dialog, timestamp, UUID.Zero, false, binaryBucket); |
| 172 | 172 | ||
| 173 | if (m_pendingOffers.ContainsKey(imSessionID)) | 173 | if (m_pendingOffers.ContainsKey(imSessionID)) |
| 174 | { | 174 | { |
| @@ -214,7 +214,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
| 214 | { | 214 | { |
| 215 | user.ControllingClient.SendInstantMessage( | 215 | user.ControllingClient.SendInstantMessage( |
| 216 | fromAgentID, message, toAgentID, fromAgentName, | 216 | fromAgentID, message, toAgentID, fromAgentName, |
| 217 | dialog, timestamp, false, binaryBucket); | 217 | dialog, timestamp, UUID.Zero, false, binaryBucket); |
| 218 | 218 | ||
| 219 | if (m_pendingOffers.ContainsKey(imSessionID)) | 219 | if (m_pendingOffers.ContainsKey(imSessionID)) |
| 220 | { | 220 | { |