From 7f0d836d35e579632413e1b06d5f5e6e6981ca05 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 31 Oct 2007 05:29:51 +0000
Subject: made illogical bitwise operations logical

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')

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
             step_time += timeStep;
             lock (OdeLock)
             {
-                if (_characters.Count > 0 & RENDER_FLAG)
+                if (_characters.Count > 0 && RENDER_FLAG)
                 {
                     Console.WriteLine("RENDER: frame");
                 }
                 foreach (OdePrim p in _prims)
                 {
-                    if (_characters.Count > 0 & RENDER_FLAG)
+                    if (_characters.Count > 0 && RENDER_FLAG)
                     {
                         Vector3 rx, ry, rz;
                         p.Orientation.ToAxes(out rx, out ry, out rz);
@@ -607,7 +607,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             d.Vector3 vel = d.BodyGetLinearVel(Body);
 
             //  if velocity is zero, use position control; otherwise, velocity control
-            if (_target_velocity.X == 0.0f & _target_velocity.Y == 0.0f & _target_velocity.Z == 0.0f & iscolliding)
+            if (_target_velocity.X == 0.0f && _target_velocity.Y == 0.0f && _target_velocity.Z == 0.0f && iscolliding)
             {
                 //  keep track of where we stopped.  No more slippin' & slidin'
                 if (!_zeroFlag)
-- 
cgit v1.1