diff options
| author | Melanie | 2009-11-24 16:00:35 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-24 16:00:35 +0000 |
| commit | cad2bf5b088c17896cb0b63db39fe4ee638f293d (patch) | |
| tree | 78f94685fa5a1340b93c42dca42cb5608e065a56 /OpenSim/Region/Physics | |
| parent | Revert "testing checkout" (diff) | |
| parent | * This concludes the packet migrations from the big nasty switch into packet ... (diff) | |
| download | opensim-SC_OLD-cad2bf5b088c17896cb0b63db39fe4ee638f293d.zip opensim-SC_OLD-cad2bf5b088c17896cb0b63db39fe4ee638f293d.tar.gz opensim-SC_OLD-cad2bf5b088c17896cb0b63db39fe4ee638f293d.tar.bz2 opensim-SC_OLD-cad2bf5b088c17896cb0b63db39fe4ee638f293d.tar.xz | |
Merge branch 'master' into careminster
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 | ||