aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-12-14 00:10:32 +0000
committerJustin Clark-Casey (justincc)2013-12-14 00:10:32 +0000
commit54cc22976868dcdc0dd0143a0134fba7392af525 (patch)
tree9bb8cadb3677f59a425a95c88ab99ee166be64e9 /OpenSim/Region/Framework
parentEliminate unnecessary line from my previous commit 1d605642 (diff)
downloadopensim-SC_OLD-54cc22976868dcdc0dd0143a0134fba7392af525.zip
opensim-SC_OLD-54cc22976868dcdc0dd0143a0134fba7392af525.tar.gz
opensim-SC_OLD-54cc22976868dcdc0dd0143a0134fba7392af525.tar.bz2
opensim-SC_OLD-54cc22976868dcdc0dd0143a0134fba7392af525.tar.xz
Fix TestSitAndStandWithNoSitTarget NPC and SP tests.
These stopped working because current code calculates sit heights based on avatar physics rather than appearance data. Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index acaeb90..c097a79 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
119 // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337> 119 // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
120 Assert.That( 120 Assert.That(
121 m_sp.AbsolutePosition, 121 m_sp.AbsolutePosition,
122 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f))); 122 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, sp.PhysicsActor.Size.Z / 2)));
123 123
124 m_sp.StandUp(); 124 m_sp.StandUp();
125 125