diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 168 |
1 files changed, 138 insertions, 30 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index bcb7f42..ae58dfd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -177,8 +177,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
177 | if (im.binaryBucket.Length < 17) // Invalid | 177 | if (im.binaryBucket.Length < 17) // Invalid |
178 | return; | 178 | return; |
179 | 179 | ||
180 | UUID receipientID = new UUID(im.toAgentID); | 180 | UUID recipientID = new UUID(im.toAgentID); |
181 | ScenePresence user = scene.GetScenePresence(receipientID); | 181 | ScenePresence user = scene.GetScenePresence(recipientID); |
182 | UUID copyID; | 182 | UUID copyID; |
183 | 183 | ||
184 | // First byte is the asset type | 184 | // First byte is the asset type |
@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
193 | folderID, new UUID(im.toAgentID)); | 193 | folderID, new UUID(im.toAgentID)); |
194 | 194 | ||
195 | InventoryFolderBase folderCopy | 195 | InventoryFolderBase folderCopy |
196 | = scene.GiveInventoryFolder(receipientID, client.AgentId, folderID, UUID.Zero); | 196 | = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero); |
197 | 197 | ||
198 | if (folderCopy == null) | 198 | if (folderCopy == null) |
199 | { | 199 | { |
@@ -246,6 +246,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
246 | im.imSessionID = itemID.Guid; | 246 | im.imSessionID = itemID.Guid; |
247 | } | 247 | } |
248 | 248 | ||
249 | im.offline = 0; | ||
250 | |||
249 | // Send the IM to the recipient. The item is already | 251 | // Send the IM to the recipient. The item is already |
250 | // in their inventory, so it will not be lost if | 252 | // in their inventory, so it will not be lost if |
251 | // they are offline. | 253 | // they are offline. |
@@ -265,8 +267,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
265 | }); | 267 | }); |
266 | } | 268 | } |
267 | } | 269 | } |
268 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) | 270 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted || |
271 | im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) | ||
269 | { | 272 | { |
273 | UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip | ||
274 | IInventoryService invService = scene.InventoryService; | ||
275 | |||
276 | // Special case: folder redirect. | ||
277 | // RLV uses this | ||
278 | if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) | ||
279 | { | ||
280 | InventoryFolderBase folder = new InventoryFolderBase(inventoryID, client.AgentId); | ||
281 | folder = invService.GetFolder(folder); | ||
282 | |||
283 | if (folder != null) | ||
284 | { | ||
285 | if (im.binaryBucket.Length >= 16) | ||
286 | { | ||
287 | UUID destFolderID = new UUID(im.binaryBucket, 0); | ||
288 | if (destFolderID != UUID.Zero) | ||
289 | { | ||
290 | InventoryFolderBase destFolder = new InventoryFolderBase(destFolderID, client.AgentId); | ||
291 | destFolder = invService.GetFolder(destFolder); | ||
292 | if (destFolder != null) | ||
293 | { | ||
294 | if (folder.ParentID != destFolder.ID) | ||
295 | { | ||
296 | folder.ParentID = destFolder.ID; | ||
297 | invService.MoveFolder(folder); | ||
298 | client.SendBulkUpdateInventory(folder); | ||
299 | } | ||
300 | } | ||
301 | } | ||
302 | } | ||
303 | } | ||
304 | } | ||
305 | |||
270 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); | 306 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); |
271 | 307 | ||
272 | if (user != null) // Local | 308 | if (user != null) // Local |
@@ -276,27 +312,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
276 | else | 312 | else |
277 | { | 313 | { |
278 | if (m_TransferModule != null) | 314 | if (m_TransferModule != null) |
279 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { | 315 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
280 | |||
281 | // justincc - FIXME: Comment out for now. This code was added in commit db91044 Mon Aug 22 2011 | ||
282 | // and is apparently supposed to fix bulk inventory updates after accepting items. But | ||
283 | // instead it appears to cause two copies of an accepted folder for the receiving user in | ||
284 | // at least some cases. Folder/item update is already done when the offer is made (see code above) | ||
285 | |||
286 | // // Send BulkUpdateInventory | ||
287 | // IInventoryService invService = scene.InventoryService; | ||
288 | // UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip | ||
289 | // | ||
290 | // InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId); | ||
291 | // folder = invService.GetFolder(folder); | ||
292 | // | ||
293 | // ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID)); | ||
294 | // | ||
295 | // // If the user has left the scene by the time the message comes back then we can't send | ||
296 | // // them the update. | ||
297 | // if (fromUser != null) | ||
298 | // fromUser.ControllingClient.SendBulkUpdateInventory(folder); | ||
299 | }); | ||
300 | } | 316 | } |
301 | } | 317 | } |
302 | 318 | ||
@@ -409,6 +425,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
409 | previousParentFolderID = folder.ParentID; | 425 | previousParentFolderID = folder.ParentID; |
410 | folder.ParentID = trashFolder.ID; | 426 | folder.ParentID = trashFolder.ID; |
411 | invService.MoveFolder(folder); | 427 | invService.MoveFolder(folder); |
428 | client.SendBulkUpdateInventory(folder); | ||
412 | } | 429 | } |
413 | } | 430 | } |
414 | 431 | ||
@@ -522,22 +539,113 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
522 | /// | 539 | /// |
523 | /// </summary> | 540 | /// </summary> |
524 | /// <param name="msg"></param> | 541 | /// <param name="msg"></param> |
525 | private void OnGridInstantMessage(GridInstantMessage msg) | 542 | private void OnGridInstantMessage(GridInstantMessage im) |
526 | { | 543 | { |
527 | // Check if this is ours to handle | 544 | // Check if this is ours to handle |
528 | // | 545 | // |
529 | Scene scene = FindClientScene(new UUID(msg.toAgentID)); | 546 | Scene scene = FindClientScene(new UUID(im.toAgentID)); |
530 | 547 | ||
531 | if (scene == null) | 548 | if (scene == null) |
532 | return; | 549 | return; |
533 | 550 | ||
534 | // Find agent to deliver to | 551 | // Find agent to deliver to |
535 | // | 552 | // |
536 | ScenePresence user = scene.GetScenePresence(new UUID(msg.toAgentID)); | 553 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); |
554 | if (user == null) | ||
555 | return; | ||
556 | |||
557 | // This requires a little bit of processing because we have to make the | ||
558 | // new item visible in the recipient's inventory here | ||
559 | // | ||
560 | if (im.dialog == (byte) InstantMessageDialog.InventoryOffered) | ||
561 | { | ||
562 | if (im.binaryBucket.Length < 17) // Invalid | ||
563 | return; | ||
564 | |||
565 | UUID recipientID = new UUID(im.toAgentID); | ||
566 | |||
567 | // First byte is the asset type | ||
568 | AssetType assetType = (AssetType)im.binaryBucket[0]; | ||
569 | |||
570 | if (AssetType.Folder == assetType) | ||
571 | { | ||
572 | UUID folderID = new UUID(im.binaryBucket, 1); | ||
537 | 573 | ||
538 | // Just forward to local handling | 574 | InventoryFolderBase given = |
539 | OnInstantMessage(user.ControllingClient, msg); | 575 | new InventoryFolderBase(folderID, recipientID); |
576 | InventoryFolderBase folder = | ||
577 | scene.InventoryService.GetFolder(given); | ||
540 | 578 | ||
579 | if (folder != null) | ||
580 | user.ControllingClient.SendBulkUpdateInventory(folder); | ||
581 | } | ||
582 | else | ||
583 | { | ||
584 | UUID itemID = new UUID(im.binaryBucket, 1); | ||
585 | |||
586 | InventoryItemBase given = | ||
587 | new InventoryItemBase(itemID, recipientID); | ||
588 | InventoryItemBase item = | ||
589 | scene.InventoryService.GetItem(given); | ||
590 | |||
591 | if (item != null) | ||
592 | { | ||
593 | user.ControllingClient.SendBulkUpdateInventory(item); | ||
594 | } | ||
595 | } | ||
596 | user.ControllingClient.SendInstantMessage(im); | ||
597 | } | ||
598 | if (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered) | ||
599 | { | ||
600 | if (im.binaryBucket.Length < 1) // Invalid | ||
601 | return; | ||
602 | |||
603 | UUID recipientID = new UUID(im.toAgentID); | ||
604 | |||
605 | // Bucket is the asset type | ||
606 | AssetType assetType = (AssetType)im.binaryBucket[0]; | ||
607 | |||
608 | if (AssetType.Folder == assetType) | ||
609 | { | ||
610 | UUID folderID = new UUID(im.imSessionID); | ||
611 | |||
612 | InventoryFolderBase given = | ||
613 | new InventoryFolderBase(folderID, recipientID); | ||
614 | InventoryFolderBase folder = | ||
615 | scene.InventoryService.GetFolder(given); | ||
616 | |||
617 | if (folder != null) | ||
618 | user.ControllingClient.SendBulkUpdateInventory(folder); | ||
619 | } | ||
620 | else | ||
621 | { | ||
622 | UUID itemID = new UUID(im.imSessionID); | ||
623 | |||
624 | InventoryItemBase given = | ||
625 | new InventoryItemBase(itemID, recipientID); | ||
626 | InventoryItemBase item = | ||
627 | scene.InventoryService.GetItem(given); | ||
628 | |||
629 | if (item != null) | ||
630 | { | ||
631 | user.ControllingClient.SendBulkUpdateInventory(item); | ||
632 | } | ||
633 | } | ||
634 | |||
635 | // Fix up binary bucket since this may be 17 chars long here | ||
636 | Byte[] bucket = new Byte[1]; | ||
637 | bucket[0] = im.binaryBucket[0]; | ||
638 | im.binaryBucket = bucket; | ||
639 | |||
640 | user.ControllingClient.SendInstantMessage(im); | ||
641 | } | ||
642 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted || | ||
643 | im.dialog == (byte) InstantMessageDialog.InventoryDeclined || | ||
644 | im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined || | ||
645 | im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) | ||
646 | { | ||
647 | user.ControllingClient.SendInstantMessage(im); | ||
648 | } | ||
541 | } | 649 | } |
542 | } | 650 | } |
543 | } | 651 | } |