diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 4afe784..82b94db 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -333,13 +333,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
333 | step_time += timeStep; | 333 | step_time += timeStep; |
334 | lock (OdeLock) | 334 | lock (OdeLock) |
335 | { | 335 | { |
336 | if (_characters.Count > 0 & RENDER_FLAG) | 336 | if (_characters.Count > 0 && RENDER_FLAG) |
337 | { | 337 | { |
338 | Console.WriteLine("RENDER: frame"); | 338 | Console.WriteLine("RENDER: frame"); |
339 | } | 339 | } |
340 | foreach (OdePrim p in _prims) | 340 | foreach (OdePrim p in _prims) |
341 | { | 341 | { |
342 | if (_characters.Count > 0 & RENDER_FLAG) | 342 | if (_characters.Count > 0 && RENDER_FLAG) |
343 | { | 343 | { |
344 | Vector3 rx, ry, rz; | 344 | Vector3 rx, ry, rz; |
345 | p.Orientation.ToAxes(out rx, out ry, out rz); | 345 | p.Orientation.ToAxes(out rx, out ry, out rz); |
@@ -607,7 +607,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
607 | d.Vector3 vel = d.BodyGetLinearVel(Body); | 607 | d.Vector3 vel = d.BodyGetLinearVel(Body); |
608 | 608 | ||
609 | // if velocity is zero, use position control; otherwise, velocity control | 609 | // if velocity is zero, use position control; otherwise, velocity control |
610 | if (_target_velocity.X == 0.0f & _target_velocity.Y == 0.0f & _target_velocity.Z == 0.0f & iscolliding) | 610 | if (_target_velocity.X == 0.0f && _target_velocity.Y == 0.0f && _target_velocity.Z == 0.0f && iscolliding) |
611 | { | 611 | { |
612 | // keep track of where we stopped. No more slippin' & slidin' | 612 | // keep track of where we stopped. No more slippin' & slidin' |
613 | if (!_zeroFlag) | 613 | if (!_zeroFlag) |