diff options
| author | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
| commit | 3f703ae1cb02cbcb0efaff061d495bacca941de0 (patch) | |
| tree | 3221068b4bc4119023b3dfa621c19e126c2eb3f3 /OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | |
| parent | Merge branch 'master' into 0.8-post-fixes (diff) | |
| parent | minor: Comment out 2 error level debugging message in authentication code (diff) | |
| download | opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.zip opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.gz opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.bz2 opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.xz | |
Merge branch 'master' into 0.8-post-fixes
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs index 1bcf879..1b8a454 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | |||
| @@ -399,8 +399,8 @@ public class BSActorAvatarMove : BSActor | |||
| 399 | m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement; | 399 | m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement; |
| 400 | } | 400 | } |
| 401 | } | 401 | } |
| 402 | m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,disp={1},force={2}", | 402 | m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,stepUp={1},isp={2},force={3}", |
| 403 | m_controllingPrim.LocalID, displacement, ret); | 403 | m_controllingPrim.LocalID, stepUp, displacement, ret); |
| 404 | 404 | ||
| 405 | } | 405 | } |
| 406 | return ret; | 406 | return ret; |