diff options
author | Melanie Thielker | 2016-07-04 03:35:48 +0100 |
---|---|---|
committer | Melanie Thielker | 2016-07-04 03:35:48 +0100 |
commit | ea8f3c83bf96453e8223d918933d5708fa49a3cc (patch) | |
tree | 288972a5d6f112426da2b5ab109fe18ba5aedc2e /OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |
parent | increase xmlrpc timeout in xmlrpcgroups, disable its cache until its entries ... (diff) | |
download | opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.zip opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.gz opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.bz2 opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
219 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), | 219 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
220 | // Is.EqualTo((int)AttachmentPoint.Chest)); | 220 | // Is.EqualTo((int)AttachmentPoint.Chest)); |
221 | 221 | ||
222 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 222 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
223 | Assert.That(attachmentItem, Is.Not.Null); | 223 | Assert.That(attachmentItem, Is.Not.Null); |
224 | Assert.That(attachmentItem.Name, Is.EqualTo(attName)); | 224 | Assert.That(attachmentItem.Name, Is.EqualTo(attName)); |
225 | 225 | ||
@@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
266 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), | 266 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
267 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); | 267 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); |
268 | 268 | ||
269 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 269 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
270 | Assert.That(attachmentItem, Is.Not.Null); | 270 | Assert.That(attachmentItem, Is.Not.Null); |
271 | Assert.That(attachmentItem.Name, Is.EqualTo(so.Name)); | 271 | Assert.That(attachmentItem.Name, Is.EqualTo(so.Name)); |
272 | 272 | ||
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
299 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), | 299 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
300 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); | 300 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); |
301 | 301 | ||
302 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 302 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
303 | Assert.That(attachmentItem, Is.Not.Null); | 303 | Assert.That(attachmentItem, Is.Not.Null); |
304 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); | 304 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); |
305 | 305 | ||
@@ -332,7 +332,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
332 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), | 332 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
333 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); | 333 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); |
334 | 334 | ||
335 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 335 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
336 | Assert.That(attachmentItem, Is.Not.Null); | 336 | Assert.That(attachmentItem, Is.Not.Null); |
337 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); | 337 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); |
338 | 338 | ||
@@ -600,7 +600,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
600 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(0)); | 600 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(0)); |
601 | 601 | ||
602 | // Check item status | 602 | // Check item status |
603 | Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItem.ID)), Is.Null); | 603 | Assert.That(scene.InventoryService.GetItem(sp.UUID, attItem.ID), Is.Null); |
604 | 604 | ||
605 | // Check object in scene | 605 | // Check object in scene |
606 | SceneObjectGroup soInScene = scene.GetSceneObjectGroup("att"); | 606 | SceneObjectGroup soInScene = scene.GetSceneObjectGroup("att"); |
@@ -679,7 +679,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
679 | 679 | ||
680 | scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, rezzedSo); | 680 | scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, rezzedSo); |
681 | 681 | ||
682 | InventoryItemBase userItemUpdated = scene.InventoryService.GetItem(userItem); | 682 | InventoryItemBase userItemUpdated = scene.InventoryService.GetItem(userItem.Owner, userItem.ID); |
683 | AssetBase asset = scene.AssetService.Get(userItemUpdated.AssetID.ToString()); | 683 | AssetBase asset = scene.AssetService.Get(userItemUpdated.AssetID.ToString()); |
684 | 684 | ||
685 | // TODO: It would probably be better here to check script state via the saving and retrieval of state | 685 | // TODO: It would probably be better here to check script state via the saving and retrieval of state |