aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2015-01-04 14:26:50 -0800
committerRobert Adams2015-01-04 14:26:50 -0800
commit103aad27f278c0e4c77021cf05c3ce74b2393217 (patch)
tree9877f47958a9e701bd919ca996931dc9ae6ac66f /OpenSim
parentBulletSim: update BulletSim DLLs and SOs to remove chatty debug log messages. (diff)
downloadopensim-SC_OLD-103aad27f278c0e4c77021cf05c3ce74b2393217.zip
opensim-SC_OLD-103aad27f278c0e4c77021cf05c3ce74b2393217.tar.gz
opensim-SC_OLD-103aad27f278c0e4c77021cf05c3ce74b2393217.tar.bz2
opensim-SC_OLD-103aad27f278c0e4c77021cf05c3ce74b2393217.tar.xz
BulletSim: comment out the reference to BSShapeHull in BulletSim tests
which seems to cause the tests to fail when compiled on the OpenSim build system. It compiles and runs everywhere else. More research is needed.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
index 608a6e6..ed7ff9b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
@@ -184,8 +184,8 @@ public class HullCreation : OpenSimTestCase
184 prim.PhysScene.DetailLog("{0}, mesh, shapeInfo={1}", prim.Name, mShape.shapeInfo); 184 prim.PhysScene.DetailLog("{0}, mesh, shapeInfo={1}", prim.Name, mShape.shapeInfo);
185 break; 185 break;
186 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeHull": 186 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeHull":
187 BSShapeHull hShape = physShape as BSShapeHull; 187 // BSShapeHull hShape = physShape as BSShapeHull;
188 prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo); 188 // prim.PhysScene.DetailLog("{0}, hull, shapeInfo={1}", prim.Name, hShape.shapeInfo);
189 break; 189 break;
190 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeConvexHull": 190 case "OpenSim.Region.Physics.BulletSPlugin.BSShapeConvexHull":
191 BSShapeConvexHull chShape = physShape as BSShapeConvexHull; 191 BSShapeConvexHull chShape = physShape as BSShapeConvexHull;