diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 92 |
1 files changed, 48 insertions, 44 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 0ac3add..941853c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -55,6 +55,7 @@ using OpenSim.Tests.Common; | |||
55 | 55 | ||
56 | namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | 56 | namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests |
57 | { | 57 | { |
58 | /* | ||
58 | /// <summary> | 59 | /// <summary> |
59 | /// Attachment tests | 60 | /// Attachment tests |
60 | /// </summary> | 61 | /// </summary> |
@@ -200,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
200 | Assert.That(so.Backup, Is.True); | 201 | Assert.That(so.Backup, Is.True); |
201 | 202 | ||
202 | m_numberOfAttachEventsFired = 0; | 203 | m_numberOfAttachEventsFired = 0; |
203 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false); | 204 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false); |
204 | 205 | ||
205 | // Check status on scene presence | 206 | // Check status on scene presence |
206 | Assert.That(sp.HasAttachments(), Is.True); | 207 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -215,11 +216,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
215 | Assert.That(attSo.Backup, Is.False); | 216 | Assert.That(attSo.Backup, Is.False); |
216 | 217 | ||
217 | // Check item status | 218 | // Check item status |
218 | Assert.That( | 219 | // Assert.That( |
219 | sp.Appearance.GetAttachpoint(attSo.FromItemID), | 220 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
220 | Is.EqualTo((int)AttachmentPoint.Chest)); | 221 | // Is.EqualTo((int)AttachmentPoint.Chest)); |
221 | 222 | ||
222 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 223 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
223 | Assert.That(attachmentItem, Is.Not.Null); | 224 | Assert.That(attachmentItem, Is.Not.Null); |
224 | Assert.That(attachmentItem.Name, Is.EqualTo(attName)); | 225 | Assert.That(attachmentItem.Name, Is.EqualTo(attName)); |
225 | 226 | ||
@@ -262,11 +263,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
262 | Assert.That(attSo.IsTemporary, Is.False); | 263 | Assert.That(attSo.IsTemporary, Is.False); |
263 | 264 | ||
264 | // Check item status | 265 | // Check item status |
265 | Assert.That( | 266 | // Assert.That( |
266 | sp.Appearance.GetAttachpoint(attSo.FromItemID), | 267 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
267 | Is.EqualTo((int)AttachmentPoint.LeftHand)); | 268 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); |
268 | 269 | ||
269 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 270 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
270 | Assert.That(attachmentItem, Is.Not.Null); | 271 | Assert.That(attachmentItem, Is.Not.Null); |
271 | Assert.That(attachmentItem.Name, Is.EqualTo(so.Name)); | 272 | Assert.That(attachmentItem.Name, Is.EqualTo(so.Name)); |
272 | 273 | ||
@@ -281,7 +282,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
281 | 282 | ||
282 | // Test wearing a different attachment from the ground. | 283 | // Test wearing a different attachment from the ground. |
283 | { | 284 | { |
284 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); | 285 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); |
285 | 286 | ||
286 | // Check status on scene presence | 287 | // Check status on scene presence |
287 | Assert.That(sp.HasAttachments(), Is.True); | 288 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -295,11 +296,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
295 | Assert.That(attSo.IsTemporary, Is.False); | 296 | Assert.That(attSo.IsTemporary, Is.False); |
296 | 297 | ||
297 | // Check item status | 298 | // Check item status |
298 | Assert.That( | 299 | // Assert.That( |
299 | sp.Appearance.GetAttachpoint(attSo.FromItemID), | 300 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
300 | Is.EqualTo((int)AttachmentPoint.LeftHand)); | 301 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); |
301 | 302 | ||
302 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 303 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
303 | Assert.That(attachmentItem, Is.Not.Null); | 304 | Assert.That(attachmentItem, Is.Not.Null); |
304 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); | 305 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); |
305 | 306 | ||
@@ -314,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
314 | 315 | ||
315 | // Test rewearing an already worn attachment from ground. Nothing should happen. | 316 | // Test rewearing an already worn attachment from ground. Nothing should happen. |
316 | { | 317 | { |
317 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); | 318 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); |
318 | 319 | ||
319 | // Check status on scene presence | 320 | // Check status on scene presence |
320 | Assert.That(sp.HasAttachments(), Is.True); | 321 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -328,11 +329,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
328 | Assert.That(attSo.IsTemporary, Is.False); | 329 | Assert.That(attSo.IsTemporary, Is.False); |
329 | 330 | ||
330 | // Check item status | 331 | // Check item status |
331 | Assert.That( | 332 | // Assert.That( |
332 | sp.Appearance.GetAttachpoint(attSo.FromItemID), | 333 | // sp.Appearance.GetAttachpoint(attSo.FromItemID), |
333 | Is.EqualTo((int)AttachmentPoint.LeftHand)); | 334 | // Is.EqualTo((int)AttachmentPoint.LeftHand)); |
334 | 335 | ||
335 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(new InventoryItemBase(attSo.FromItemID)); | 336 | InventoryItemBase attachmentItem = scene.InventoryService.GetItem(sp.UUID, attSo.FromItemID); |
336 | Assert.That(attachmentItem, Is.Not.Null); | 337 | Assert.That(attachmentItem, Is.Not.Null); |
337 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); | 338 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); |
338 | 339 | ||
@@ -372,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
372 | sp2.AbsolutePosition = new Vector3(0, 0, 0); | 373 | sp2.AbsolutePosition = new Vector3(0, 0, 0); |
373 | sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero); | 374 | sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero); |
374 | 375 | ||
375 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false); | 376 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false); |
376 | 377 | ||
377 | Assert.That(sp.HasAttachments(), Is.False); | 378 | Assert.That(sp.HasAttachments(), Is.False); |
378 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 379 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
@@ -410,8 +411,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
410 | Assert.IsFalse(attSo.Backup); | 411 | Assert.IsFalse(attSo.Backup); |
411 | 412 | ||
412 | // Check appearance status | 413 | // Check appearance status |
413 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); | 414 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); |
414 | Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest)); | 415 | // Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest)); |
415 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 416 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
416 | 417 | ||
417 | // Check events | 418 | // Check events |
@@ -435,8 +436,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
435 | Assert.That(attSo.IsTemporary, Is.False); | 436 | Assert.That(attSo.IsTemporary, Is.False); |
436 | 437 | ||
437 | // Check appearance status | 438 | // Check appearance status |
438 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); | 439 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); |
439 | Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest)); | 440 | // Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest)); |
440 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 441 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
441 | 442 | ||
442 | // Check events | 443 | // Check events |
@@ -474,8 +475,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
474 | Assert.That(attSo.IsAttachment); | 475 | Assert.That(attSo.IsAttachment); |
475 | 476 | ||
476 | // Check appearance status | 477 | // Check appearance status |
477 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); | 478 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); |
478 | Assert.That(sp.Appearance.GetAttachpoint(attItem1.ID), Is.EqualTo((int)AttachmentPoint.LeftHand)); | 479 | // Assert.That(sp.Appearance.GetAttachpoint(attItem1.ID), Is.EqualTo((int)AttachmentPoint.LeftHand)); |
479 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 480 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
480 | 481 | ||
481 | // Check events | 482 | // Check events |
@@ -484,7 +485,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
484 | 485 | ||
485 | // Test wearing a second attachment at the same position | 486 | // Test wearing a second attachment at the same position |
486 | // Until multiple attachments at one point is implemented, this will remove the first attachment | 487 | // Until multiple attachments at one point is implemented, this will remove the first attachment |
487 | // This test relies on both attachments having the same default attachment point (in this case LeftHand | 488 | // This test relies on both attachments having the same default attachment point (in this case LeftHand |
488 | // since none other has been set). | 489 | // since none other has been set). |
489 | { | 490 | { |
490 | scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, attItem2.ID, (uint)AttachmentPoint.Default); | 491 | scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, attItem2.ID, (uint)AttachmentPoint.Default); |
@@ -499,8 +500,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
499 | Assert.That(attSo.IsAttachment); | 500 | Assert.That(attSo.IsAttachment); |
500 | 501 | ||
501 | // Check appearance status | 502 | // Check appearance status |
502 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); | 503 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); |
503 | Assert.That(sp.Appearance.GetAttachpoint(attItem2.ID), Is.EqualTo((int)AttachmentPoint.LeftHand)); | 504 | // Assert.That(sp.Appearance.GetAttachpoint(attItem2.ID), Is.EqualTo((int)AttachmentPoint.LeftHand)); |
504 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 505 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
505 | 506 | ||
506 | // Check events | 507 | // Check events |
@@ -521,8 +522,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
521 | Assert.That(attSo.IsAttachment); | 522 | Assert.That(attSo.IsAttachment); |
522 | 523 | ||
523 | // Check appearance status | 524 | // Check appearance status |
524 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); | 525 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); |
525 | Assert.That(sp.Appearance.GetAttachpoint(attItem2.ID), Is.EqualTo((int)AttachmentPoint.LeftHand)); | 526 | // Assert.That(sp.Appearance.GetAttachpoint(attItem2.ID), Is.EqualTo((int)AttachmentPoint.LeftHand)); |
526 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 527 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
527 | 528 | ||
528 | // Check events | 529 | // Check events |
@@ -556,6 +557,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
556 | // In the future, we need to be able to do this programatically more predicably. | 557 | // In the future, we need to be able to do this programatically more predicably. |
557 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; | 558 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; |
558 | 559 | ||
560 | m_chatEvent.Reset(); | ||
559 | scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 561 | scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); |
560 | 562 | ||
561 | m_chatEvent.WaitOne(60000); | 563 | m_chatEvent.WaitOne(60000); |
@@ -596,10 +598,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
596 | Assert.That(attachments.Count, Is.EqualTo(0)); | 598 | Assert.That(attachments.Count, Is.EqualTo(0)); |
597 | 599 | ||
598 | // Check appearance status | 600 | // Check appearance status |
599 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(0)); | 601 | // Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(0)); |
600 | 602 | ||
601 | // Check item status | 603 | // Check item status |
602 | Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItem.ID)), Is.Null); | 604 | Assert.That(scene.InventoryService.GetItem(sp.UUID, attItem.ID), Is.Null); |
603 | 605 | ||
604 | // Check object in scene | 606 | // Check object in scene |
605 | SceneObjectGroup soInScene = scene.GetSceneObjectGroup("att"); | 607 | SceneObjectGroup soInScene = scene.GetSceneObjectGroup("att"); |
@@ -634,7 +636,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
634 | Assert.That(attachments.Count, Is.EqualTo(0)); | 636 | Assert.That(attachments.Count, Is.EqualTo(0)); |
635 | 637 | ||
636 | // Check item status | 638 | // Check item status |
637 | Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo(0)); | 639 | // Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo(0)); |
638 | 640 | ||
639 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(0)); | 641 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(0)); |
640 | 642 | ||
@@ -669,15 +671,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
669 | // In the future, we need to be able to do this programatically more predicably. | 671 | // In the future, we need to be able to do this programatically more predicably. |
670 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; | 672 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; |
671 | 673 | ||
674 | m_chatEvent.Reset(); | ||
672 | SceneObjectGroup rezzedSo | 675 | SceneObjectGroup rezzedSo |
673 | = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 676 | = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); |
674 | 677 | ||
675 | // Wait for chat to signal rezzed script has been started. | 678 | // Wait for chat to signal rezzed script has been started. |
676 | m_chatEvent.WaitOne(60000); | 679 | m_chatEvent.WaitOne(60000); |
677 | 680 | ||
678 | scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, rezzedSo); | 681 | scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, rezzedSo); |
679 | 682 | ||
680 | InventoryItemBase userItemUpdated = scene.InventoryService.GetItem(userItem); | 683 | InventoryItemBase userItemUpdated = scene.InventoryService.GetItem(userItem.Owner, userItem.ID); |
681 | AssetBase asset = scene.AssetService.Get(userItemUpdated.AssetID.ToString()); | 684 | AssetBase asset = scene.AssetService.Get(userItemUpdated.AssetID.ToString()); |
682 | 685 | ||
683 | // TODO: It would probably be better here to check script state via the saving and retrieval of state | 686 | // TODO: It would probably be better here to check script state via the saving and retrieval of state |
@@ -689,7 +692,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
689 | Assert.That(scriptStateNodes.Count, Is.EqualTo(1)); | 692 | Assert.That(scriptStateNodes.Count, Is.EqualTo(1)); |
690 | 693 | ||
691 | // Re-rez the attachment to check script running state | 694 | // Re-rez the attachment to check script running state |
692 | SceneObjectGroup reRezzedSo = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 695 | SceneObjectGroup reRezzedSo = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); |
693 | 696 | ||
694 | // Wait for chat to signal rezzed script has been started. | 697 | // Wait for chat to signal rezzed script has been started. |
695 | m_chatEvent.WaitOne(60000); | 698 | m_chatEvent.WaitOne(60000); |
@@ -719,13 +722,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
719 | acd.Appearance.SetAttachment((int)AttachmentPoint.Chest, attItem.ID, attItem.AssetID); | 722 | acd.Appearance.SetAttachment((int)AttachmentPoint.Chest, attItem.ID, attItem.AssetID); |
720 | ScenePresence presence = SceneHelpers.AddScenePresence(scene, acd); | 723 | ScenePresence presence = SceneHelpers.AddScenePresence(scene, acd); |
721 | 724 | ||
722 | SceneObjectGroup rezzedAtt = presence.GetAttachments()[0]; | 725 | UUID rezzedAttID = presence.GetAttachments()[0].UUID; |
723 | 726 | ||
724 | m_numberOfAttachEventsFired = 0; | 727 | m_numberOfAttachEventsFired = 0; |
725 | scene.CloseAgent(presence.UUID, false); | 728 | scene.CloseAgent(presence.UUID, false); |
726 | 729 | ||
727 | // Check that we can't retrieve this attachment from the scene. | 730 | // Check that we can't retrieve this attachment from the scene. |
728 | Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null); | 731 | Assert.That(scene.GetSceneObjectGroup(rezzedAttID), Is.Null); |
729 | 732 | ||
730 | // Check events | 733 | // Check events |
731 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | 734 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); |
@@ -802,7 +805,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
802 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | 805 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); |
803 | } | 806 | } |
804 | 807 | ||
805 | /* | 808 | |
806 | [Test] | 809 | [Test] |
807 | public void TestSameSimulatorNeighbouringRegionsTeleportV1() | 810 | public void TestSameSimulatorNeighbouringRegionsTeleportV1() |
808 | { | 811 | { |
@@ -842,7 +845,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
842 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); | 845 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); |
843 | 846 | ||
844 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour | 847 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour |
845 | lscm.ServiceVersion = 0.1f; | 848 | //lscm.ServiceVersion = 0.1f; |
846 | 849 | ||
847 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); | 850 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); |
848 | 851 | ||
@@ -910,7 +913,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
910 | // Check events | 913 | // Check events |
911 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | 914 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); |
912 | } | 915 | } |
913 | */ | 916 | |
914 | 917 | ||
915 | [Test] | 918 | [Test] |
916 | public void TestSameSimulatorNeighbouringRegionsTeleportV2() | 919 | public void TestSameSimulatorNeighbouringRegionsTeleportV2() |
@@ -972,8 +975,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
972 | // Both these operations will occur on different threads and will wait for each other. | 975 | // Both these operations will occur on different threads and will wait for each other. |
973 | // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1 | 976 | // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1 |
974 | // test protocol, where we are trying to avoid unpredictable async operations in regression tests. | 977 | // test protocol, where we are trying to avoid unpredictable async operations in regression tests. |
975 | tc.OnTestClientSendRegionTeleport | 978 | tc.OnTestClientSendRegionTeleport |
976 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) | 979 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) |
977 | => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null); | 980 | => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null); |
978 | 981 | ||
979 | m_numberOfAttachEventsFired = 0; | 982 | m_numberOfAttachEventsFired = 0; |
@@ -1023,4 +1026,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
1023 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | 1026 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); |
1024 | } | 1027 | } |
1025 | } | 1028 | } |
1029 | */ | ||
1026 | } | 1030 | } |