diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 085328c..6c2cf0a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -270,8 +270,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
270 | // RLV uses this | 270 | // RLV uses this |
271 | if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) | 271 | if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) |
272 | { | 272 | { |
273 | InventoryFolderBase folder = new InventoryFolderBase(inventoryID, client.AgentId); | 273 | InventoryFolderBase folder = invService.GetFolder(client.AgentId, inventoryID); |
274 | folder = invService.GetFolder(folder); | ||
275 | 274 | ||
276 | if (folder != null) | 275 | if (folder != null) |
277 | { | 276 | { |
@@ -280,8 +279,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
280 | UUID destFolderID = new UUID(im.binaryBucket, 0); | 279 | UUID destFolderID = new UUID(im.binaryBucket, 0); |
281 | if (destFolderID != UUID.Zero) | 280 | if (destFolderID != UUID.Zero) |
282 | { | 281 | { |
283 | InventoryFolderBase destFolder = new InventoryFolderBase(destFolderID, client.AgentId); | 282 | InventoryFolderBase destFolder = invService.GetFolder(client.AgentId, destFolderID); |
284 | destFolder = invService.GetFolder(destFolder); | ||
285 | if (destFolder != null) | 283 | if (destFolder != null) |
286 | { | 284 | { |
287 | if (folder.ParentID != destFolder.ID) | 285 | if (folder.ParentID != destFolder.ID) |
@@ -339,8 +337,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
339 | 337 | ||
340 | UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip | 338 | UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip |
341 | 339 | ||
342 | InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId); | 340 | InventoryItemBase item = invService.GetItem(client.AgentId, inventoryID); |
343 | item = invService.GetItem(item); | ||
344 | InventoryFolderBase folder = null; | 341 | InventoryFolderBase folder = null; |
345 | UUID? previousParentFolderID = null; | 342 | UUID? previousParentFolderID = null; |
346 | 343 | ||
@@ -354,8 +351,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
354 | } | 351 | } |
355 | else | 352 | else |
356 | { | 353 | { |
357 | folder = new InventoryFolderBase(inventoryID, client.AgentId); | 354 | folder = invService.GetFolder(client.AgentId, inventoryID); |
358 | folder = invService.GetFolder(folder); | ||
359 | 355 | ||
360 | if (folder != null) // It's a folder | 356 | if (folder != null) // It's a folder |
361 | { | 357 | { |
@@ -368,9 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
368 | // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code). | 364 | // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code). |
369 | if (previousParentFolderID != null) | 365 | if (previousParentFolderID != null) |
370 | { | 366 | { |
371 | InventoryFolderBase previousParentFolder | 367 | InventoryFolderBase previousParentFolder = invService.GetFolder(client.AgentId, (UUID)previousParentFolderID); |
372 | = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId); | ||
373 | previousParentFolder = invService.GetFolder(previousParentFolder); | ||
374 | scene.SendInventoryUpdate(client, previousParentFolder, true, true); | 368 | scene.SendInventoryUpdate(client, previousParentFolder, true, true); |
375 | 369 | ||
376 | scene.SendInventoryUpdate(client, destinationFolder, true, true); | 370 | scene.SendInventoryUpdate(client, destinationFolder, true, true); |
@@ -392,8 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
392 | 386 | ||
393 | UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip | 387 | UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip |
394 | 388 | ||
395 | InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId); | 389 | InventoryItemBase item = invService.GetItem(client.AgentId, inventoryID); |
396 | item = invService.GetItem(item); | ||
397 | InventoryFolderBase folder = null; | 390 | InventoryFolderBase folder = null; |
398 | UUID? previousParentFolderID = null; | 391 | UUID? previousParentFolderID = null; |
399 | 392 | ||
@@ -410,8 +403,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
410 | } | 403 | } |
411 | else | 404 | else |
412 | { | 405 | { |
413 | folder = new InventoryFolderBase(inventoryID, client.AgentId); | 406 | folder = invService.GetFolder(client.AgentId, inventoryID); |
414 | folder = invService.GetFolder(folder); | ||
415 | 407 | ||
416 | if (folder != null & trashFolder != null) | 408 | if (folder != null & trashFolder != null) |
417 | { | 409 | { |
@@ -439,9 +431,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
439 | // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code). | 431 | // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code). |
440 | else if (previousParentFolderID != null) | 432 | else if (previousParentFolderID != null) |
441 | { | 433 | { |
442 | InventoryFolderBase previousParentFolder | 434 | InventoryFolderBase previousParentFolder = invService.GetFolder(client.AgentId, (UUID)previousParentFolderID); |
443 | = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId); | ||
444 | previousParentFolder = invService.GetFolder(previousParentFolder); | ||
445 | scene.SendInventoryUpdate(client, previousParentFolder, true, true); | 435 | scene.SendInventoryUpdate(client, previousParentFolder, true, true); |
446 | 436 | ||
447 | scene.SendInventoryUpdate(client, trashFolder, true, true); | 437 | scene.SendInventoryUpdate(client, trashFolder, true, true); |
@@ -500,10 +490,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
500 | { | 490 | { |
501 | UUID folderID = new UUID(im.binaryBucket, 1); | 491 | UUID folderID = new UUID(im.binaryBucket, 1); |
502 | 492 | ||
503 | InventoryFolderBase given = | ||
504 | new InventoryFolderBase(folderID, recipientID); | ||
505 | InventoryFolderBase folder = | 493 | InventoryFolderBase folder = |
506 | scene.InventoryService.GetFolder(given); | 494 | scene.InventoryService.GetFolder(recipientID, folderID); |
507 | 495 | ||
508 | if (folder != null) | 496 | if (folder != null) |
509 | user.ControllingClient.SendBulkUpdateInventory(folder); | 497 | user.ControllingClient.SendBulkUpdateInventory(folder); |
@@ -512,10 +500,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
512 | { | 500 | { |
513 | UUID itemID = new UUID(im.binaryBucket, 1); | 501 | UUID itemID = new UUID(im.binaryBucket, 1); |
514 | 502 | ||
515 | InventoryItemBase given = | ||
516 | new InventoryItemBase(itemID, recipientID); | ||
517 | InventoryItemBase item = | 503 | InventoryItemBase item = |
518 | scene.InventoryService.GetItem(given); | 504 | scene.InventoryService.GetItem(recipientID, itemID); |
519 | 505 | ||
520 | if (item != null) | 506 | if (item != null) |
521 | { | 507 | { |
@@ -538,10 +524,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
538 | { | 524 | { |
539 | UUID folderID = new UUID(im.imSessionID); | 525 | UUID folderID = new UUID(im.imSessionID); |
540 | 526 | ||
541 | InventoryFolderBase given = | ||
542 | new InventoryFolderBase(folderID, recipientID); | ||
543 | InventoryFolderBase folder = | 527 | InventoryFolderBase folder = |
544 | scene.InventoryService.GetFolder(given); | 528 | scene.InventoryService.GetFolder(recipientID, folderID); |
545 | 529 | ||
546 | if (folder != null) | 530 | if (folder != null) |
547 | user.ControllingClient.SendBulkUpdateInventory(folder); | 531 | user.ControllingClient.SendBulkUpdateInventory(folder); |
@@ -550,10 +534,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
550 | { | 534 | { |
551 | UUID itemID = new UUID(im.imSessionID); | 535 | UUID itemID = new UUID(im.imSessionID); |
552 | 536 | ||
553 | InventoryItemBase given = | ||
554 | new InventoryItemBase(itemID, recipientID); | ||
555 | InventoryItemBase item = | 537 | InventoryItemBase item = |
556 | scene.InventoryService.GetItem(given); | 538 | scene.InventoryService.GetItem(recipientID, itemID); |
557 | 539 | ||
558 | if (item != null) | 540 | if (item != null) |
559 | { | 541 | { |