Finally remove the requirement for an InventoryItem/FolderBase object to

be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.

6 files changed, 24 insertions, 48 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 0cc630f..8f03a0a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -898,8 +898,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, scriptedState);
 
-                InventoryItemBase item = new InventoryItemBase(grp.FromItemID, sp.UUID);
-                item = m_scene.InventoryService.GetItem(item);
+                InventoryItemBase item = m_scene.InventoryService.GetItem(sp.UUID, grp.FromItemID);
 
                 if (item != null)
                 {
@@ -1223,8 +1222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 return;
             }
 
-            InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID);
-            item = m_scene.InventoryService.GetItem(item);
+            InventoryItemBase item = m_scene.InventoryService.GetItem(sp.UUID, itemID);
             if (item == null)
                 return;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 10b2ff6..a83342c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 //                sp.Appearance.GetAttachpoint(attSo.FromItemID),
 //                Is.EqualTo((int)AttachmentPoint.Chest));
 
-            InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID));
+            InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID);
             Assert.That(attachmentItem, Is.Not.Null);
             Assert.That(attachmentItem.Name, Is.EqualTo(attName));
 
@@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 //                    sp.Appearance.GetAttachpoint(attSo.FromItemID),
 //                    Is.EqualTo((int)AttachmentPoint.LeftHand));
 
-                InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID));
+                InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID);
                 Assert.That(attachmentItem, Is.Not.Null);
                 Assert.That(attachmentItem.Name, Is.EqualTo(so.Name));
 
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 //                    sp.Appearance.GetAttachpoint(attSo.FromItemID),
 //                    Is.EqualTo((int)AttachmentPoint.LeftHand));
 
-                InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID));
+                InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID);
                 Assert.That(attachmentItem, Is.Not.Null);
                 Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name));
 
@@ -332,7 +332,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 //                    sp.Appearance.GetAttachpoint(attSo.FromItemID),
 //                    Is.EqualTo((int)AttachmentPoint.LeftHand));
 
-                InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID));
+                InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID);
                 Assert.That(attachmentItem, Is.Not.Null);
                 Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name));
 
@@ -600,7 +600,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 //            Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(0));
 
             // Check item status
-            Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItem.ID)), Is.Null);
+            Assert.That(scene.InventoryService.GetItem(sp.UUID, attItem.ID), Is.Null);
 
             // Check object in scene
             SceneObjectGroup soInScene = scene.GetSceneObjectGroup("att");
@@ -679,7 +679,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, rezzedSo);
 
-            InventoryItemBase userItemUpdated = scene.InventoryService.GetItem(userItem);
+            InventoryItemBase userItemUpdated = scene.InventoryService.GetItem(userItem.Owner, userItem.ID);
             AssetBase asset = scene.AssetService.Get(userItemUpdated.AssetID.ToString());
 
             // TODO: It would probably be better here to check script state via the saving and retrieval of state
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index c800383..08b276d 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -904,8 +904,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                 continue;
                         }
 
-                        InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
-                        baseItem = invService.GetItem(baseItem);
+                        InventoryItemBase baseItem = invService.GetItem(userID, appearance.Wearables[i][j].ItemID);
 
                         if (baseItem != null)
                         {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
index eb23e83..e5bf919 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
@@ -239,8 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             InventoryFolderBase trashFolder =
                     invService.GetFolderForType(client.AgentId, FolderType.Trash);
 
-            InventoryItemBase item = new InventoryItemBase(transactionID, client.AgentId);
-            item = invService.GetItem(item);
+            InventoryItemBase item = invService.GetItem(client.AgentId, transactionID);
 
             if (item != null && trashFolder != null)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 095c57b..4efcd3b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -86,8 +86,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
         {
             IInventoryService invService = m_scene.InventoryService;
 
-            InventoryItemBase item = new InventoryItemBase(gestureId, client.AgentId);
-            item = invService.GetItem(item);
+            InventoryItemBase item = invService.GetItem(client.AgentId, gestureId);
             if (item != null)
             {
                 item.Flags |= 1;
@@ -102,8 +101,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
         {
             IInventoryService invService = m_scene.InventoryService;
 
-            InventoryItemBase item = new InventoryItemBase(gestureId, client.AgentId);
-            item = invService.GetItem(item);
+            InventoryItemBase item = invService.GetItem(client.AgentId, gestureId);
             if (item != null)
             {
                 item.Flags &= ~(uint)1;
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)
                     {