OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into bigmerge 

Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
avinationmerge
Melanie 2011-11-07 02:41:56 +00:00
parent 69322b84ce 6d92d65140
commit adbc69bb07
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
View File

@ -287,7 +287,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
// default avatar. // default avatar.
Assert.That( Assert.That(
npc.AbsolutePosition, 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); npcModule.Stand(npc.UUID, scene);