diff options
| author | Melanie | 2011-11-07 02:41:56 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-07 02:41:56 +0000 |
| commit | adbc69bb0780300d9a83b8bc3c913d91a8153ec1 (patch) | |
| tree | 71038a37d63debd975c1928b153addd819291e64 /OpenSim/Region | |
| parent | Fix up failing test to compensate for changed sit target offset (diff) | |
| parent | That such a trivial change can be so difficult to get right. Fix it this time. (diff) | |
| download | opensim-SC_OLD-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.zip opensim-SC_OLD-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.tar.gz opensim-SC_OLD-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.tar.bz2 opensim-SC_OLD-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index 2e147fb..6305d27 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 | |||
| 287 | // default avatar. | 287 | // default avatar. |
| 288 | Assert.That( | 288 | Assert.That( |
| 289 | npc.AbsolutePosition, | 289 | npc.AbsolutePosition, |
| 290 | Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993)); | 290 | Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993f))); |
| 291 | 291 | ||
| 292 | npcModule.Stand(npc.UUID, scene); | 292 | npcModule.Stand(npc.UUID, scene); |
| 293 | 293 | ||