diff options
author | Robert Adams | 2012-10-22 16:33:21 -0700 |
---|---|---|
committer | Robert Adams | 2012-10-22 22:24:59 -0700 |
commit | 14eeb8b31b865f7b1927703028b03b6f61693cb6 (patch) | |
tree | 3139a56a535d1919a8cb4b6d93a66e3100866c51 /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |
parent | BulletSim: fix problem of not rebuilding shape by clearing last rebuild faile... (diff) | |
download | opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.zip opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.gz opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.bz2 opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.xz |
BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh assets weren't already in the cache. Comment cleanups.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs index b58745a..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; |
@@ -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; |