diff options
| author | root | 2009-11-26 20:41:38 +0100 |
|---|---|---|
| committer | root | 2009-11-26 20:41:38 +0100 |
| commit | 2c3f6aaa878b5458eeeab8544226ff53b7172f5a (patch) | |
| tree | 48941505962693508016fafb479c2baaf1b3568f /OpenSim/Region/Physics | |
| parent | First attempt at mult-sit on large single prims. (diff) | |
| parent | Remove OS version crap from about dialog (diff) | |
| download | opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.zip opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.gz opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.bz2 opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.xz | |
Merge branch 'careminster' into tests
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index e6b31ca..a0aba2a 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -835,7 +835,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 835 | // allows us to have different settings | 835 | // allows us to have different settings |
| 836 | 836 | ||
| 837 | // We only need to test p2 for 'jump crouch purposes' | 837 | // We only need to test p2 for 'jump crouch purposes' |
| 838 | if (p2 is OdeCharacter) | 838 | if (p2 is OdeCharacter && p1.PhysicsActorType == (int)ActorTypes.Prim) |
| 839 | { | 839 | { |
| 840 | // Testing if the collision is at the feet of the avatar | 840 | // Testing if the collision is at the feet of the avatar |
| 841 | 841 | ||