mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 10:46:00 +08:00
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user