From 67780b00f07827a586be46f91aff5693596238f5 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 6 Nov 2011 21:46:03 +0000 Subject: [PATCH 1/3] Fix up failing test to compensate for changed sit target offset --- .../Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index d2b79f749a..2e147fb0e9 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs @@ -287,7 +287,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests // default avatar. Assert.That( npc.AbsolutePosition, - Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8857438f))); + Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993)); npcModule.Stand(npc.UUID, scene); @@ -295,4 +295,4 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests Assert.That(npc.ParentID, Is.EqualTo(0)); } } -} \ No newline at end of file +} From e775b3fc478c8793cced1cd5fd42d13a4af94c24 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 7 Nov 2011 02:03:17 +0000 Subject: [PATCH 2/3] Fix build break --- .../Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index 2e147fb0e9..e368d214fa 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs @@ -287,7 +287,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests // default avatar. Assert.That( npc.AbsolutePosition, - Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993)); + Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993))); npcModule.Stand(npc.UUID, scene); From 6d92d6514079eff8d3d50c6397ae70f0b916c373 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 7 Nov 2011 02:40:35 +0000 Subject: [PATCH 3/3] That such a trivial change can be so difficult to get right. Fix it this time. --- .../Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index e368d214fa..6305d272f7 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs @@ -287,7 +287,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests // default avatar. Assert.That( npc.AbsolutePosition, - Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993))); + Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993f))); npcModule.Stand(npc.UUID, scene);