diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 2939282..b8e4f08 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -212,11 +212,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
212 | // And notify. Transaction ID is the item ID. We get that | 212 | // And notify. Transaction ID is the item ID. We get that |
213 | // same ID back on the reply so we know what to act on | 213 | // same ID back on the reply so we know what to act on |
214 | // | 214 | // |
215 | user.ControllingClient.SendInstantMessage( | 215 | user.ControllingClient.SendInstantMessage(im); |
216 | new UUID(im.fromAgentID), im.message, | ||
217 | new UUID(im.toAgentID), | ||
218 | im.fromAgentName, im.dialog, im.timestamp, | ||
219 | copyID, false, im.binaryBucket); | ||
220 | 216 | ||
221 | return; | 217 | return; |
222 | } | 218 | } |
@@ -232,11 +228,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
232 | 228 | ||
233 | if (user != null) // Local | 229 | if (user != null) // Local |
234 | { | 230 | { |
235 | user.ControllingClient.SendInstantMessage( | 231 | user.ControllingClient.SendInstantMessage(im); |
236 | new UUID(im.fromAgentID), im.message, | ||
237 | new UUID(im.toAgentID), | ||
238 | im.fromAgentName, im.dialog, im.timestamp, | ||
239 | UUID.Zero, false, im.binaryBucket); | ||
240 | } | 232 | } |
241 | else | 233 | else |
242 | { | 234 | { |
@@ -303,11 +295,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
303 | 295 | ||
304 | if (user != null) // Local | 296 | if (user != null) // Local |
305 | { | 297 | { |
306 | user.ControllingClient.SendInstantMessage( | 298 | user.ControllingClient.SendInstantMessage(im); |
307 | new UUID(im.fromAgentID), im.message, | ||
308 | new UUID(im.toAgentID), | ||
309 | im.fromAgentName, im.dialog, im.timestamp, | ||
310 | UUID.Zero, false, im.binaryBucket); | ||
311 | } | 299 | } |
312 | else | 300 | else |
313 | { | 301 | { |
@@ -460,11 +448,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
460 | 448 | ||
461 | // Deliver message | 449 | // Deliver message |
462 | // | 450 | // |
463 | user.ControllingClient.SendInstantMessage( | 451 | user.ControllingClient.SendInstantMessage(msg); |
464 | new UUID(msg.fromAgentID), msg.message, | ||
465 | new UUID(msg.toAgentID), | ||
466 | msg.fromAgentName, msg.dialog, msg.timestamp, | ||
467 | folderID, false, msg.binaryBucket); | ||
468 | } | 452 | } |
469 | else | 453 | else |
470 | { | 454 | { |
@@ -497,11 +481,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
497 | 481 | ||
498 | // Deliver message | 482 | // Deliver message |
499 | // | 483 | // |
500 | user.ControllingClient.SendInstantMessage( | 484 | user.ControllingClient.SendInstantMessage(msg); |
501 | new UUID(msg.fromAgentID), msg.message, | ||
502 | new UUID(msg.toAgentID), | ||
503 | msg.fromAgentName, msg.dialog, msg.timestamp, | ||
504 | itemID, false, msg.binaryBucket); | ||
505 | } | 485 | } |
506 | } | 486 | } |
507 | } | 487 | } |