diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 4e58045..f023e77 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -201,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
201 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID); | 201 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID); |
202 | 202 | ||
203 | m_numberOfAttachEventsFired = 0; | 203 | m_numberOfAttachEventsFired = 0; |
204 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false); | 204 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false); |
205 | 205 | ||
206 | // Check status on scene presence | 206 | // Check status on scene presence |
207 | Assert.That(sp.HasAttachments(), Is.True); | 207 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
248 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "att1", sp.UUID); | 248 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "att1", sp.UUID); |
249 | 249 | ||
250 | m_numberOfAttachEventsFired = 0; | 250 | m_numberOfAttachEventsFired = 0; |
251 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, true, false); | 251 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, true, false, false); |
252 | 252 | ||
253 | // Check status on scene presence | 253 | // Check status on scene presence |
254 | Assert.That(sp.HasAttachments(), Is.True); | 254 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
281 | 281 | ||
282 | // Test wearing a different attachment from the ground. | 282 | // Test wearing a different attachment from the ground. |
283 | { | 283 | { |
284 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); | 284 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false, false); |
285 | 285 | ||
286 | // Check status on scene presence | 286 | // Check status on scene presence |
287 | Assert.That(sp.HasAttachments(), Is.True); | 287 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -314,7 +314,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
314 | 314 | ||
315 | // Test rewearing an already worn attachment from ground. Nothing should happen. | 315 | // Test rewearing an already worn attachment from ground. Nothing should happen. |
316 | { | 316 | { |
317 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); | 317 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false, false); |
318 | 318 | ||
319 | // Check status on scene presence | 319 | // Check status on scene presence |
320 | Assert.That(sp.HasAttachments(), Is.True); | 320 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
372 | sp2.AbsolutePosition = new Vector3(0, 0, 0); | 372 | sp2.AbsolutePosition = new Vector3(0, 0, 0); |
373 | sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero); | 373 | sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero); |
374 | 374 | ||
375 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false); | 375 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false); |
376 | 376 | ||
377 | Assert.That(sp.HasAttachments(), Is.False); | 377 | Assert.That(sp.HasAttachments(), Is.False); |
378 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 378 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
@@ -667,7 +667,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
667 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; | 667 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; |
668 | 668 | ||
669 | SceneObjectGroup rezzedSo | 669 | SceneObjectGroup rezzedSo |
670 | = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 670 | = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); |
671 | 671 | ||
672 | // Wait for chat to signal rezzed script has been started. | 672 | // Wait for chat to signal rezzed script has been started. |
673 | m_chatEvent.WaitOne(60000); | 673 | m_chatEvent.WaitOne(60000); |
@@ -686,7 +686,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
686 | Assert.That(scriptStateNodes.Count, Is.EqualTo(1)); | 686 | Assert.That(scriptStateNodes.Count, Is.EqualTo(1)); |
687 | 687 | ||
688 | // Re-rez the attachment to check script running state | 688 | // Re-rez the attachment to check script running state |
689 | SceneObjectGroup reRezzedSo = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 689 | SceneObjectGroup reRezzedSo = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); |
690 | 690 | ||
691 | // Wait for chat to signal rezzed script has been started. | 691 | // Wait for chat to signal rezzed script has been started. |
692 | m_chatEvent.WaitOne(60000); | 692 | m_chatEvent.WaitOne(60000); |