diff options
| author | Melanie | 2012-08-16 02:46:48 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-16 02:46:48 +0100 |
| commit | 90ad98370aead53e886832a83a3e8793f361426e (patch) | |
| tree | b7076c5fb7ecf75d1ad31f7756543ade8fbf1b49 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | Remove AreUpdatesSuspended flag because it does nothing (diff) | |
| parent | Do a proper null check to avoid the overloaded operator == trap (diff) | |
| download | opensim-SC-90ad98370aead53e886832a83a3e8793f361426e.zip opensim-SC-90ad98370aead53e886832a83a3e8793f361426e.tar.gz opensim-SC-90ad98370aead53e886832a83a3e8793f361426e.tar.bz2 opensim-SC-90ad98370aead53e886832a83a3e8793f361426e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index c197e61..5a9f135 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -613,7 +613,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 613 | MoveAngular(pTimestep); | 613 | MoveAngular(pTimestep); |
| 614 | LimitRotation(pTimestep); | 614 | LimitRotation(pTimestep); |
| 615 | 615 | ||
| 616 | DetailLog("{0},Dynamics,done,pos={1},force={2},velocity={3},angvel={4}", | 616 | DetailLog("{0},BSDynamics.Step,done,pos={1},force={2},velocity={3},angvel={4}", |
| 617 | m_prim.LocalID, m_prim.Position, m_prim.Force, m_prim.Velocity, m_prim.RotationalVelocity); | 617 | m_prim.LocalID, m_prim.Position, m_prim.Force, m_prim.Velocity, m_prim.RotationalVelocity); |
| 618 | }// end Step | 618 | }// end Step |
| 619 | 619 | ||