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
                 // RLV uses this
                 if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
                 {
-                    InventoryFolderBase folder = new InventoryFolderBase(inventoryID, client.AgentId);
-                    folder = invService.GetFolder(folder);
+                    InventoryFolderBase folder = invService.GetFolder(client.AgentId, inventoryID);
 
                     if (folder != null)
                     {
@@ -280,8 +279,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                             UUID destFolderID = new UUID(im.binaryBucket, 0);
                             if (destFolderID != UUID.Zero)
                             {
-                                InventoryFolderBase destFolder = new InventoryFolderBase(destFolderID, client.AgentId);
-                                destFolder = invService.GetFolder(destFolder);
+                                InventoryFolderBase destFolder = invService.GetFolder(client.AgentId, destFolderID);
                                 if (destFolder != null)
                                 {
                                     if (folder.ParentID != destFolder.ID)
@@ -339,8 +337,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                     UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
 
-                    InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
-                    item = invService.GetItem(item);
+                    InventoryItemBase item = invService.GetItem(client.AgentId, inventoryID);
                     InventoryFolderBase folder = null;
                     UUID? previousParentFolderID = null;
 
@@ -354,8 +351,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     }
                     else
                     {
-                        folder = new InventoryFolderBase(inventoryID, client.AgentId);
-                        folder = invService.GetFolder(folder);
+                        folder = invService.GetFolder(client.AgentId, inventoryID);
 
                         if (folder != null) // It's a folder
                         {
@@ -368,9 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code).
                     if (previousParentFolderID != null)
                     {
-                        InventoryFolderBase previousParentFolder
-                            = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
-                        previousParentFolder = invService.GetFolder(previousParentFolder);
+                        InventoryFolderBase previousParentFolder = invService.GetFolder(client.AgentId, (UUID)previousParentFolderID);
                         scene.SendInventoryUpdate(client, previousParentFolder, true, true);
 
                         scene.SendInventoryUpdate(client, destinationFolder, true, true);
@@ -392,8 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                 UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
 
-                InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
-                item = invService.GetItem(item);
+                InventoryItemBase item = invService.GetItem(client.AgentId, inventoryID);
                 InventoryFolderBase folder = null;
                 UUID? previousParentFolderID = null;
                 
@@ -410,8 +403,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 }
                 else
                 {
-                    folder = new InventoryFolderBase(inventoryID, client.AgentId);
-                    folder = invService.GetFolder(folder);
+                    folder = invService.GetFolder(client.AgentId, inventoryID);
 
                     if (folder != null & trashFolder != null)
                     {
@@ -439,9 +431,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code).
                 else if (previousParentFolderID != null)
                 {
-                    InventoryFolderBase previousParentFolder
-                        = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
-                    previousParentFolder = invService.GetFolder(previousParentFolder);
+                    InventoryFolderBase previousParentFolder = invService.GetFolder(client.AgentId, (UUID)previousParentFolderID);
                     scene.SendInventoryUpdate(client, previousParentFolder, true, true);
 
                     scene.SendInventoryUpdate(client, trashFolder, true, true);
@@ -500,10 +490,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     UUID folderID = new UUID(im.binaryBucket, 1);
 
-                    InventoryFolderBase given =
-                            new InventoryFolderBase(folderID, recipientID);
                     InventoryFolderBase folder =
-                            scene.InventoryService.GetFolder(given);
+                            scene.InventoryService.GetFolder(recipientID, folderID);
 
                     if (folder != null)
                         user.ControllingClient.SendBulkUpdateInventory(folder);
@@ -512,10 +500,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     UUID itemID = new UUID(im.binaryBucket, 1);
 
-                    InventoryItemBase given =
-                            new InventoryItemBase(itemID, recipientID);
                     InventoryItemBase item =
-                            scene.InventoryService.GetItem(given);
+                            scene.InventoryService.GetItem(recipientID, itemID);
 
                     if (item != null)
                     {
@@ -538,10 +524,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     UUID folderID = new UUID(im.imSessionID);
 
-                    InventoryFolderBase given =
-                            new InventoryFolderBase(folderID, recipientID);
                     InventoryFolderBase folder =
-                            scene.InventoryService.GetFolder(given);
+                            scene.InventoryService.GetFolder(recipientID, folderID);
 
                     if (folder != null)
                         user.ControllingClient.SendBulkUpdateInventory(folder);
@@ -550,10 +534,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     UUID itemID = new UUID(im.imSessionID);
 
-                    InventoryItemBase given =
-                            new InventoryItemBase(itemID, recipientID);
                     InventoryItemBase item =
-                            scene.InventoryService.GetItem(given);
+                            scene.InventoryService.GetItem(recipientID, itemID);
 
                     if (item != null)
                     {