From 210f227fe69138f736e3d37e5bfbacd10e967922 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 2 Oct 2012 11:11:22 -0700
Subject: BulletSim: Make parameter value defaults match what should be the
 default and what is in OpenSimDefaults.ini. Comment and debug printout
 changes.

---
 OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index d49e5f3..a43880d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -71,7 +71,7 @@ public struct BulletBody
         buff.Append(ID.ToString());
         buff.Append(",p=");
         buff.Append(ptr.ToString("X"));
-        if (collisionFilter != 0 && collisionMask != 0)
+        if (collisionFilter != 0 || collisionMask != 0)
         {
             buff.Append(",f=");
             buff.Append(collisionFilter.ToString("X"));
-- 
cgit v1.1