diff options
| author | Melanie | 2011-12-12 11:09:13 +0100 |
|---|---|---|
| committer | Melanie | 2011-12-12 11:09:13 +0100 |
| commit | 95d533ce8a18be6451fb3492f6f659bcb2bbe241 (patch) | |
| tree | a914550165e016b9746a0f1911c9dc2f4ca6c28c /OpenSim/Region/Framework/Scenes/Tests | |
| parent | Send changed animation event asynchronously (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.zip opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.gz opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.bz2 opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs index 4a0533c..89f8007 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | |||
| @@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 61 | 61 | ||
| 62 | TestScene scene = SceneHelpers.SetupScene(); | 62 | TestScene scene = SceneHelpers.SetupScene(); |
| 63 | ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1)); | 63 | ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1)); |
| 64 | sp.PhysicsActor.Flying = true; | 64 | sp.Flying = true; |
| 65 | sp.PhysicsCollisionUpdate(new CollisionEventUpdate()); | 65 | sp.PhysicsCollisionUpdate(new CollisionEventUpdate()); |
| 66 | 66 | ||
| 67 | Assert.That(sp.Animator.CurrentMovementAnimation, Is.EqualTo("HOVER")); | 67 | Assert.That(sp.Animator.CurrentMovementAnimation, Is.EqualTo("HOVER")); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs index 64c36ff..442cb8b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs | |||
| @@ -79,7 +79,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 79 | // Vector3 startPos = new Vector3(128, 128, 30); | 79 | // Vector3 startPos = new Vector3(128, 128, 30); |
| 80 | 80 | ||
| 81 | // For now, we'll make the scene presence fly to simplify this test, but this needs to change. | 81 | // For now, we'll make the scene presence fly to simplify this test, but this needs to change. |
| 82 | sp.PhysicsActor.Flying = true; | 82 | sp.Flying = true; |
| 83 | 83 | ||
| 84 | m_scene.Update(); | 84 | m_scene.Update(); |
| 85 | Assert.That(sp.AbsolutePosition, Is.EqualTo(startPos)); | 85 | Assert.That(sp.AbsolutePosition, Is.EqualTo(startPos)); |