diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/CoreModules/Avatar/Attachments/Tests | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
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 f1b002b..b632774 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 | Assert.That(so.Backup, Is.True); | 201 | Assert.That(so.Backup, Is.True); |
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); |
@@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
249 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "att1", sp.UUID); | 249 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "att1", sp.UUID); |
250 | 250 | ||
251 | m_numberOfAttachEventsFired = 0; | 251 | m_numberOfAttachEventsFired = 0; |
252 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, true, false); | 252 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, true, false, false); |
253 | 253 | ||
254 | // Check status on scene presence | 254 | // Check status on scene presence |
255 | Assert.That(sp.HasAttachments(), Is.True); | 255 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
282 | 282 | ||
283 | // Test wearing a different attachment from the ground. | 283 | // Test wearing a different attachment from the ground. |
284 | { | 284 | { |
285 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); | 285 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false, false); |
286 | 286 | ||
287 | // Check status on scene presence | 287 | // Check status on scene presence |
288 | Assert.That(sp.HasAttachments(), Is.True); | 288 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
315 | 315 | ||
316 | // Test rewearing an already worn attachment from ground. Nothing should happen. | 316 | // Test rewearing an already worn attachment from ground. Nothing should happen. |
317 | { | 317 | { |
318 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false); | 318 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false, false); |
319 | 319 | ||
320 | // Check status on scene presence | 320 | // Check status on scene presence |
321 | Assert.That(sp.HasAttachments(), Is.True); | 321 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
373 | sp2.AbsolutePosition = new Vector3(0, 0, 0); | 373 | sp2.AbsolutePosition = new Vector3(0, 0, 0); |
374 | sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero); | 374 | sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero); |
375 | 375 | ||
376 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false); | 376 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false); |
377 | 377 | ||
378 | Assert.That(sp.HasAttachments(), Is.False); | 378 | Assert.That(sp.HasAttachments(), Is.False); |
379 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 379 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
@@ -671,7 +671,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
671 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; | 671 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; |
672 | 672 | ||
673 | SceneObjectGroup rezzedSo | 673 | SceneObjectGroup rezzedSo |
674 | = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 674 | = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); |
675 | 675 | ||
676 | // Wait for chat to signal rezzed script has been started. | 676 | // Wait for chat to signal rezzed script has been started. |
677 | m_chatEvent.WaitOne(60000); | 677 | m_chatEvent.WaitOne(60000); |
@@ -690,7 +690,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
690 | Assert.That(scriptStateNodes.Count, Is.EqualTo(1)); | 690 | Assert.That(scriptStateNodes.Count, Is.EqualTo(1)); |
691 | 691 | ||
692 | // Re-rez the attachment to check script running state | 692 | // Re-rez the attachment to check script running state |
693 | SceneObjectGroup reRezzedSo = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 693 | SceneObjectGroup reRezzedSo = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); |
694 | 694 | ||
695 | // Wait for chat to signal rezzed script has been started. | 695 | // Wait for chat to signal rezzed script has been started. |
696 | m_chatEvent.WaitOne(60000); | 696 | m_chatEvent.WaitOne(60000); |