diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-23 11:44:22 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-23 11:44:22 -0500 |
| commit | 3ebb528c794450e9fe45cb8fa39d1bcf71a34052 (patch) | |
| tree | d34b84e319aa72e91acb4209ba87a06123d104b3 /OpenSim/Region | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC-3ebb528c794450e9fe45cb8fa39d1bcf71a34052.zip opensim-SC-3ebb528c794450e9fe45cb8fa39d1bcf71a34052.tar.gz opensim-SC-3ebb528c794450e9fe45cb8fa39d1bcf71a34052.tar.bz2 opensim-SC-3ebb528c794450e9fe45cb8fa39d1bcf71a34052.tar.xz | |
* Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390
Diffstat (limited to 'OpenSim/Region')
| -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 | ||