diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 168 |
2 files changed, 139 insertions, 31 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index ee10d04..0833154 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -635,4 +635,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
635 | m_assetsLoaded = true; | 635 | m_assetsLoaded = true; |
636 | } | 636 | } |
637 | } | 637 | } |
638 | } \ No newline at end of file | 638 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index f3af59a..81de29c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -175,8 +175,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
175 | if (im.binaryBucket.Length < 17) // Invalid | 175 | if (im.binaryBucket.Length < 17) // Invalid |
176 | return; | 176 | return; |
177 | 177 | ||
178 | UUID receipientID = new UUID(im.toAgentID); | 178 | UUID recipientID = new UUID(im.toAgentID); |
179 | ScenePresence user = scene.GetScenePresence(receipientID); | 179 | ScenePresence user = scene.GetScenePresence(recipientID); |
180 | UUID copyID; | 180 | UUID copyID; |
181 | 181 | ||
182 | // First byte is the asset type | 182 | // First byte is the asset type |
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
191 | folderID, new UUID(im.toAgentID)); | 191 | folderID, new UUID(im.toAgentID)); |
192 | 192 | ||
193 | InventoryFolderBase folderCopy | 193 | InventoryFolderBase folderCopy |
194 | = scene.GiveInventoryFolder(receipientID, client.AgentId, folderID, UUID.Zero); | 194 | = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero); |
195 | 195 | ||
196 | if (folderCopy == null) | 196 | if (folderCopy == null) |
197 | { | 197 | { |
@@ -244,6 +244,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
244 | im.imSessionID = itemID.Guid; | 244 | im.imSessionID = itemID.Guid; |
245 | } | 245 | } |
246 | 246 | ||
247 | im.offline = 0; | ||
248 | |||
247 | // Send the IM to the recipient. The item is already | 249 | // Send the IM to the recipient. The item is already |
248 | // in their inventory, so it will not be lost if | 250 | // in their inventory, so it will not be lost if |
249 | // they are offline. | 251 | // they are offline. |
@@ -263,8 +265,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
263 | }); | 265 | }); |
264 | } | 266 | } |
265 | } | 267 | } |
266 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) | 268 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted || |
269 | im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) | ||
267 | { | 270 | { |
271 | UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip | ||
272 | IInventoryService invService = scene.InventoryService; | ||
273 | |||
274 | // Special case: folder redirect. | ||
275 | // RLV uses this | ||
276 | if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) | ||
277 | { | ||
278 | InventoryFolderBase folder = new InventoryFolderBase(inventoryID, client.AgentId); | ||
279 | folder = invService.GetFolder(folder); | ||
280 | |||
281 | if (folder != null) | ||
282 | { | ||
283 | if (im.binaryBucket.Length >= 16) | ||
284 | { | ||
285 | UUID destFolderID = new UUID(im.binaryBucket, 0); | ||
286 | if (destFolderID != UUID.Zero) | ||
287 | { | ||
288 | InventoryFolderBase destFolder = new InventoryFolderBase(destFolderID, client.AgentId); | ||
289 | destFolder = invService.GetFolder(destFolder); | ||
290 | if (destFolder != null) | ||
291 | { | ||
292 | if (folder.ParentID != destFolder.ID) | ||
293 | { | ||
294 | folder.ParentID = destFolder.ID; | ||
295 | invService.MoveFolder(folder); | ||
296 | client.SendBulkUpdateInventory(folder); | ||
297 | } | ||
298 | } | ||
299 | } | ||
300 | } | ||
301 | } | ||
302 | } | ||
303 | |||
268 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); | 304 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); |
269 | 305 | ||
270 | if (user != null) // Local | 306 | if (user != null) // Local |
@@ -274,27 +310,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
274 | else | 310 | else |
275 | { | 311 | { |
276 | if (m_TransferModule != null) | 312 | if (m_TransferModule != null) |
277 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { | 313 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
278 | |||
279 | // justincc - FIXME: Comment out for now. This code was added in commit db91044 Mon Aug 22 2011 | ||
280 | // and is apparently supposed to fix bulk inventory updates after accepting items. But | ||
281 | // instead it appears to cause two copies of an accepted folder for the receiving user in | ||
282 | // at least some cases. Folder/item update is already done when the offer is made (see code above) | ||
283 | |||
284 | // // Send BulkUpdateInventory | ||
285 | // IInventoryService invService = scene.InventoryService; | ||
286 | // UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip | ||
287 | // | ||
288 | // InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId); | ||
289 | // folder = invService.GetFolder(folder); | ||
290 | // | ||
291 | // ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID)); | ||
292 | // | ||
293 | // // If the user has left the scene by the time the message comes back then we can't send | ||
294 | // // them the update. | ||
295 | // if (fromUser != null) | ||
296 | // fromUser.ControllingClient.SendBulkUpdateInventory(folder); | ||
297 | }); | ||
298 | } | 314 | } |
299 | } | 315 | } |
300 | else if ( | 316 | else if ( |
@@ -335,6 +351,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
335 | { | 351 | { |
336 | folder.ParentID = trashFolder.ID; | 352 | folder.ParentID = trashFolder.ID; |
337 | invService.MoveFolder(folder); | 353 | invService.MoveFolder(folder); |
354 | client.SendBulkUpdateInventory(folder); | ||
338 | } | 355 | } |
339 | } | 356 | } |
340 | 357 | ||
@@ -435,22 +452,113 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
435 | /// | 452 | /// |
436 | /// </summary> | 453 | /// </summary> |
437 | /// <param name="msg"></param> | 454 | /// <param name="msg"></param> |
438 | private void OnGridInstantMessage(GridInstantMessage msg) | 455 | private void OnGridInstantMessage(GridInstantMessage im) |
439 | { | 456 | { |
440 | // Check if this is ours to handle | 457 | // Check if this is ours to handle |
441 | // | 458 | // |
442 | Scene scene = FindClientScene(new UUID(msg.toAgentID)); | 459 | Scene scene = FindClientScene(new UUID(im.toAgentID)); |
443 | 460 | ||
444 | if (scene == null) | 461 | if (scene == null) |
445 | return; | 462 | return; |
446 | 463 | ||
447 | // Find agent to deliver to | 464 | // Find agent to deliver to |
448 | // | 465 | // |
449 | ScenePresence user = scene.GetScenePresence(new UUID(msg.toAgentID)); | 466 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); |
467 | if (user == null) | ||
468 | return; | ||
469 | |||
470 | // This requires a little bit of processing because we have to make the | ||
471 | // new item visible in the recipient's inventory here | ||
472 | // | ||
473 | if (im.dialog == (byte) InstantMessageDialog.InventoryOffered) | ||
474 | { | ||
475 | if (im.binaryBucket.Length < 17) // Invalid | ||
476 | return; | ||
477 | |||
478 | UUID recipientID = new UUID(im.toAgentID); | ||
479 | |||
480 | // First byte is the asset type | ||
481 | AssetType assetType = (AssetType)im.binaryBucket[0]; | ||
482 | |||
483 | if (AssetType.Folder == assetType) | ||
484 | { | ||
485 | UUID folderID = new UUID(im.binaryBucket, 1); | ||
450 | 486 | ||
451 | // Just forward to local handling | 487 | InventoryFolderBase given = |
452 | OnInstantMessage(user.ControllingClient, msg); | 488 | new InventoryFolderBase(folderID, recipientID); |
489 | InventoryFolderBase folder = | ||
490 | scene.InventoryService.GetFolder(given); | ||
453 | 491 | ||
492 | if (folder != null) | ||
493 | user.ControllingClient.SendBulkUpdateInventory(folder); | ||
494 | } | ||
495 | else | ||
496 | { | ||
497 | UUID itemID = new UUID(im.binaryBucket, 1); | ||
498 | |||
499 | InventoryItemBase given = | ||
500 | new InventoryItemBase(itemID, recipientID); | ||
501 | InventoryItemBase item = | ||
502 | scene.InventoryService.GetItem(given); | ||
503 | |||
504 | if (item != null) | ||
505 | { | ||
506 | user.ControllingClient.SendBulkUpdateInventory(item); | ||
507 | } | ||
508 | } | ||
509 | user.ControllingClient.SendInstantMessage(im); | ||
510 | } | ||
511 | if (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered) | ||
512 | { | ||
513 | if (im.binaryBucket.Length < 1) // Invalid | ||
514 | return; | ||
515 | |||
516 | UUID recipientID = new UUID(im.toAgentID); | ||
517 | |||
518 | // Bucket is the asset type | ||
519 | AssetType assetType = (AssetType)im.binaryBucket[0]; | ||
520 | |||
521 | if (AssetType.Folder == assetType) | ||
522 | { | ||
523 | UUID folderID = new UUID(im.imSessionID); | ||
524 | |||
525 | InventoryFolderBase given = | ||
526 | new InventoryFolderBase(folderID, recipientID); | ||
527 | InventoryFolderBase folder = | ||
528 | scene.InventoryService.GetFolder(given); | ||
529 | |||
530 | if (folder != null) | ||
531 | user.ControllingClient.SendBulkUpdateInventory(folder); | ||
532 | } | ||
533 | else | ||
534 | { | ||
535 | UUID itemID = new UUID(im.imSessionID); | ||
536 | |||
537 | InventoryItemBase given = | ||
538 | new InventoryItemBase(itemID, recipientID); | ||
539 | InventoryItemBase item = | ||
540 | scene.InventoryService.GetItem(given); | ||
541 | |||
542 | if (item != null) | ||
543 | { | ||
544 | user.ControllingClient.SendBulkUpdateInventory(item); | ||
545 | } | ||
546 | } | ||
547 | |||
548 | // Fix up binary bucket since this may be 17 chars long here | ||
549 | Byte[] bucket = new Byte[1]; | ||
550 | bucket[0] = im.binaryBucket[0]; | ||
551 | im.binaryBucket = bucket; | ||
552 | |||
553 | user.ControllingClient.SendInstantMessage(im); | ||
554 | } | ||
555 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted || | ||
556 | im.dialog == (byte) InstantMessageDialog.InventoryDeclined || | ||
557 | im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined || | ||
558 | im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) | ||
559 | { | ||
560 | user.ControllingClient.SendInstantMessage(im); | ||
561 | } | ||
454 | } | 562 | } |
455 | } | 563 | } |
456 | } | 564 | } |