diff options
author | Justin Clark-Casey (justincc) | 2012-10-24 02:04:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-24 02:04:26 +0100 |
commit | 326f1507fac61d1f50470eebd0b873f8c2360338 (patch) | |
tree | e8c650707f20fd454c3d18187b063a9cb29349a7 /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |
parent | minor: Move co-ordinate related help to object commands to common ConsoleUtil... (diff) | |
parent | BulletSim: update binaries with small change that insures that manual positio... (diff) | |
download | opensim-SC-326f1507fac61d1f50470eebd0b873f8c2360338.zip opensim-SC-326f1507fac61d1f50470eebd0b873f8c2360338.tar.gz opensim-SC-326f1507fac61d1f50470eebd0b873f8c2360338.tar.bz2 opensim-SC-326f1507fac61d1f50470eebd0b873f8c2360338.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs index a20be3a..f017cdd 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |||
@@ -34,6 +34,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
34 | 34 | ||
35 | public abstract class BSConstraint : IDisposable | 35 | public abstract class BSConstraint : IDisposable |
36 | { | 36 | { |
37 | private static string LogHeader = "[BULLETSIM CONSTRAINT]"; | ||
38 | |||
37 | protected BulletSim m_world; | 39 | protected BulletSim m_world; |
38 | protected BulletBody m_body1; | 40 | protected BulletBody m_body1; |
39 | protected BulletBody m_body2; | 41 | protected BulletBody m_body2; |
@@ -53,7 +55,7 @@ public abstract class BSConstraint : IDisposable | |||
53 | { | 55 | { |
54 | bool success = BulletSimAPI.DestroyConstraint2(m_world.ptr, m_constraint.ptr); | 56 | bool success = BulletSimAPI.DestroyConstraint2(m_world.ptr, m_constraint.ptr); |
55 | m_world.physicsScene.DetailLog("{0},BSConstraint.Dispose,taint,id1={1},body1={2},id2={3},body2={4},success={5}", | 57 | m_world.physicsScene.DetailLog("{0},BSConstraint.Dispose,taint,id1={1},body1={2},id2={3},body2={4},success={5}", |
56 | BSScene.DetailLogZero, | 58 | BSScene.DetailLogZero, |
57 | m_body1.ID, m_body1.ptr.ToString("X"), | 59 | m_body1.ID, m_body1.ptr.ToString("X"), |
58 | m_body2.ID, m_body2.ptr.ToString("X"), | 60 | m_body2.ID, m_body2.ptr.ToString("X"), |
59 | success); | 61 | success); |
@@ -124,7 +126,7 @@ public abstract class BSConstraint : IDisposable | |||
124 | } | 126 | } |
125 | else | 127 | else |
126 | { | 128 | { |
127 | m_world.physicsScene.Logger.ErrorFormat("[BULLETSIM CONSTRAINT] CalculateTransforms failed. A={0}, B={1}", Body1.ID, Body2.ID); | 129 | m_world.physicsScene.Logger.ErrorFormat("{0} CalculateTransforms failed. A={1}, B={2}", LogHeader, Body1.ID, Body2.ID); |
128 | } | 130 | } |
129 | } | 131 | } |
130 | return ret; | 132 | return ret; |