aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
diff options
context:
space:
mode:
authorRobert Adams2012-10-02 11:11:22 -0700
committerRobert Adams2012-10-02 11:14:15 -0700
commit210f227fe69138f736e3d37e5bfbacd10e967922 (patch)
tree23c2f8061e9f3f1d31c379ffabd9d07fd18ca81b /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
parentBulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ... (diff)
downloadopensim-SC_OLD-210f227fe69138f736e3d37e5bfbacd10e967922.zip
opensim-SC_OLD-210f227fe69138f736e3d37e5bfbacd10e967922.tar.gz
opensim-SC_OLD-210f227fe69138f736e3d37e5bfbacd10e967922.tar.bz2
opensim-SC_OLD-210f227fe69138f736e3d37e5bfbacd10e967922.tar.xz
BulletSim: Make parameter value defaults match what should be the default and what is in OpenSimDefaults.ini. Comment and debug printout changes.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs2
1 files changed, 1 insertions, 1 deletions
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
71 buff.Append(ID.ToString()); 71 buff.Append(ID.ToString());
72 buff.Append(",p="); 72 buff.Append(",p=");
73 buff.Append(ptr.ToString("X")); 73 buff.Append(ptr.ToString("X"));
74 if (collisionFilter != 0 && collisionMask != 0) 74 if (collisionFilter != 0 || collisionMask != 0)
75 { 75 {
76 buff.Append(",f="); 76 buff.Append(",f=");
77 buff.Append(collisionFilter.ToString("X")); 77 buff.Append(collisionFilter.ToString("X"));