aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2011-11-10 17:35:35 +0000
committerMelanie2011-11-10 17:35:35 +0000
commita1426739a214d9cd04169bbb7a8855fdfd2ef588 (patch)
tree061416a45c8cdceb25273f9f79f078d2ba1ea8e5 /OpenSim/Region/OptionalModules/World
parentFix the ability to move the seated avatar via LSL (diff)
parentAdd GuduleLapointe to list of contributors (diff)
downloadopensim-SC_OLD-a1426739a214d9cd04169bbb7a8855fdfd2ef588.zip
opensim-SC_OLD-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.gz
opensim-SC_OLD-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.bz2
opensim-SC_OLD-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index 6305d27..dce0ec8 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -285,9 +285,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
285 285
286 // FIXME: This is different for live avatars - z position is adjusted. This is half the height of the 286 // FIXME: This is different for live avatars - z position is adjusted. This is half the height of the
287 // default avatar. 287 // default avatar.
288 // Curiously, Vector3.ToString() will not display the last two places of the float. For example,
289 // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
288 Assert.That( 290 Assert.That(
289 npc.AbsolutePosition, 291 npc.AbsolutePosition,
290 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.8454993f))); 292 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f)));
291 293
292 npcModule.Stand(npc.UUID, scene); 294 npcModule.Stand(npc.UUID, scene);
293 295