diff options
| author | Melanie | 2013-03-13 02:03:46 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-13 02:03:46 +0000 |
| commit | 0e426c5cd0ac7225cd27b7bc79c95fce1c5ea427 (patch) | |
| tree | bcc97297c292e3e6d8d7a496a5bad8afea22e3f8 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Spot fix the interpenetration issue. Thanks, Ter. (diff) | |
| download | opensim-SC_OLD-0e426c5cd0ac7225cd27b7bc79c95fce1c5ea427.zip opensim-SC_OLD-0e426c5cd0ac7225cd27b7bc79c95fce1c5ea427.tar.gz opensim-SC_OLD-0e426c5cd0ac7225cd27b7bc79c95fce1c5ea427.tar.bz2 opensim-SC_OLD-0e426c5cd0ac7225cd27b7bc79c95fce1c5ea427.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index f7e4c1c..bea34d4 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -1014,8 +1014,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1014 | offset.Y += contact.pos.Y; | 1014 | offset.Y += contact.pos.Y; |
| 1015 | offset.Z += contact.pos.Z; | 1015 | offset.Z += contact.pos.Z; |
| 1016 | 1016 | ||
| 1017 | _position = offset; | 1017 | //_position = offset; |
| 1018 | return false; | 1018 | //return false; |
| 1019 | } | 1019 | } |
| 1020 | 1020 | ||
| 1021 | offset.X = contact.pos.X - _position.X; | 1021 | offset.X = contact.pos.X - _position.X; |