From 1cf24b70925f206f334fadb0baf20779aa9793f6 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 29 May 2013 04:47:59 +0100 Subject: [PATCH] make sure friction slip parameters are zero ( or other value ) and not default cmf --- OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 49dc03ce1a..8abf6cf73d 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs @@ -175,10 +175,10 @@ namespace OpenSim.Region.Physics.OdePlugin // const d.ContactFlags comumContactFlags = d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM |d.ContactFlags.Approx1 | d.ContactFlags.Bounce; - const d.ContactFlags comumContactFlags = d.ContactFlags.Bounce | d.ContactFlags.Approx1; + const d.ContactFlags comumContactFlags = d.ContactFlags.Bounce | d.ContactFlags.Approx1 | d.ContactFlags.Slip1 | d.ContactFlags.Slip2; const float comumContactERP = 0.7f; const float comumContactCFM = 0.0001f; - const float comumContactSLIP = 0.000001f; + const float comumContactSLIP = 0f; float frictionMovementMult = 0.8f; @@ -411,7 +411,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomSetCategoryBits(GroundSpace, (uint)(CollisionCategories.Land)); d.GeomSetCollideBits(GroundSpace, 0); - contactgroup = d.JointGroupCreate(0); + contactgroup = d.JointGroupCreate(maxContactsbeforedeath + 1); //contactgroup d.WorldSetAutoDisableFlag(world, false);