aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
diff options
context:
space:
mode:
authorRobert Adams2013-05-03 14:23:53 -0700
committerRobert Adams2013-05-03 14:23:53 -0700
commit5d25bb3084937d266375cba61b3a2c802bd57717 (patch)
tree73d291b1ed6b2368d1f23ca4d8e5f91f55885b0e /OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
parentBulletSim: prims with no cuts created with single convex hull shape. (diff)
downloadopensim-SC_OLD-5d25bb3084937d266375cba61b3a2c802bd57717.zip
opensim-SC_OLD-5d25bb3084937d266375cba61b3a2c802bd57717.tar.gz
opensim-SC_OLD-5d25bb3084937d266375cba61b3a2c802bd57717.tar.bz2
opensim-SC_OLD-5d25bb3084937d266375cba61b3a2c802bd57717.tar.xz
BulletSim: zero vehicle motion when changing vehicle type.
Rebuild compound linkset of any child in the linkset changes shape. Comments and better detailed logging messages.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 794857c..64aaa15 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -254,10 +254,10 @@ public sealed class BSShapeCollection : IDisposable
254 } 254 }
255 else 255 else
256 { 256 {
257 // The current shape on the prim is the correct one. We don't need the potential reference.
257 potentialHull.Dereference(m_physicsScene); 258 potentialHull.Dereference(m_physicsScene);
258 } 259 }
259 if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1},key={2}", 260 if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1}", prim.LocalID, prim.PhysShape);
260 prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
261 } 261 }
262 else 262 else
263 { 263 {
@@ -277,8 +277,7 @@ public sealed class BSShapeCollection : IDisposable
277 // We don't need this reference to the mesh that is already being using. 277 // We don't need this reference to the mesh that is already being using.
278 potentialMesh.Dereference(m_physicsScene); 278 potentialMesh.Dereference(m_physicsScene);
279 } 279 }
280 if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1},key={2}", 280 if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1}", prim.LocalID, prim.PhysShape);
281 prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
282 } 281 }
283 return ret; 282 return ret;
284 } 283 }