Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2011-11-07 02:41:56 +00:00 · 2011-11-07 02:41:56 +00:00 · adbc69bb07
parent 69322b84ce 6d92d65140
commit adbc69bb07
1 changed files with 1 additions and 1 deletions
--- 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);