diff options
author | Justin Clark-Casey (justincc) | 2013-12-14 00:10:32 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-12-14 00:10:32 +0000 |
commit | 54cc22976868dcdc0dd0143a0134fba7392af525 (patch) | |
tree | 9bb8cadb3677f59a425a95c88ab99ee166be64e9 /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | |
parent | Eliminate unnecessary line from my previous commit 1d605642 (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs index e43136a..0d17e0e 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | |||
@@ -118,14 +118,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
118 | 118 | ||
119 | public override Vector3 Position { get; set; } | 119 | public override Vector3 Position { get; set; } |
120 | 120 | ||
121 | public override Vector3 Size | 121 | public override Vector3 Size { get; set; } |
122 | { | ||
123 | get { return _size; } | ||
124 | set { | ||
125 | _size = value; | ||
126 | _size.Z = _size.Z / 2.0f; | ||
127 | } | ||
128 | } | ||
129 | 122 | ||
130 | public override PrimitiveBaseShape Shape | 123 | public override PrimitiveBaseShape Shape |
131 | { | 124 | { |