aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorRobert Adams2012-08-08 13:48:49 -0700
committerRobert Adams2012-08-08 13:48:49 -0700
commit5ab151c2d69277b8c528b8ebe94d2b0d2312a2fc (patch)
tree2cd84dea4822aa671aa04bbfe94d1fde2e1df0d2 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentBulletSim: Added avatar capsule scaling for size of avatar. (diff)
downloadopensim-SC-5ab151c2d69277b8c528b8ebe94d2b0d2312a2fc.zip
opensim-SC-5ab151c2d69277b8c528b8ebe94d2b0d2312a2fc.tar.gz
opensim-SC-5ab151c2d69277b8c528b8ebe94d2b0d2312a2fc.tar.bz2
opensim-SC-5ab151c2d69277b8c528b8ebe94d2b0d2312a2fc.tar.xz
BulletSim: add avatar code to keep avatars from ending up trapped under the terrain
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 11868bc..98b69b1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -42,7 +42,7 @@ public sealed class BSPrim : PhysicsActor
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 private static readonly string LogHeader = "[BULLETS PRIM]"; 43 private static readonly string LogHeader = "[BULLETS PRIM]";
44 44
45 private void DebugLog(string mm, params Object[] xx) { if (_scene.shouldDebugLog) m_log.DebugFormat(mm, xx); } 45 private void DebugLog(string mm, params Object[] xx) { if (_scene.ShouldDebugLog) m_log.DebugFormat(mm, xx); }
46 46
47 private IMesh _mesh; 47 private IMesh _mesh;
48 private PrimitiveBaseShape _pbs; 48 private PrimitiveBaseShape _pbs;
@@ -1338,7 +1338,6 @@ public sealed class BSPrim : PhysicsActor
1338 1338
1339 base.RequestPhysicsterseUpdate(); 1339 base.RequestPhysicsterseUpdate();
1340 } 1340 }
1341 /*
1342 else 1341 else
1343 { 1342 {
1344 // For debugging, we also report the movement of children 1343 // For debugging, we also report the movement of children
@@ -1346,7 +1345,6 @@ public sealed class BSPrim : PhysicsActor
1346 LocalID, entprop.Position, entprop.Rotation, entprop.Velocity, 1345 LocalID, entprop.Position, entprop.Rotation, entprop.Velocity,
1347 entprop.Acceleration, entprop.RotationalVelocity); 1346 entprop.Acceleration, entprop.RotationalVelocity);
1348 } 1347 }
1349 */
1350 } 1348 }
1351 1349
1352 // I've collided with something 1350 // I've collided with something