From 4b760bba79ad92b00423c5930d19a85f6c36722e Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Wed, 31 Dec 2008 19:35:46 +0000 Subject: - Added the fixed Ode.NET.dll - Adapted code to match the corrected signatures - Fixes Mantis #2934. Hopefully. Note: Physics on linked objects still don't work correctly: It doesn't crash the region anymore, but the example object in the mentioned mantis now falls through the ground. --- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 10 +++++----- bin/Ode.NET.dll | Bin 65536 -> 51200 bytes 2 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 bin/Ode.NET.dll diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index f012a2f..bfb9b1a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -987,8 +987,8 @@ namespace OpenSim.Region.Physics.OdePlugin d.Matrix3 mat = new d.Matrix3(); d.RfromQ(out mat, ref quat); - d.MassRotate(out m2, ref mat); - d.MassTranslate(out m2, Position.X - prm.Position.X, Position.Y - prm.Position.Y, Position.Z - prm.Position.Z); + d.MassRotate(ref m2, ref mat); + d.MassTranslate(ref m2, Position.X - prm.Position.X, Position.Y - prm.Position.Y, Position.Z - prm.Position.Z); d.MassAdd(ref pMass, ref m2); } foreach (OdePrim prm in childrenPrim) @@ -1025,7 +1025,7 @@ namespace OpenSim.Region.Physics.OdePlugin // (Position.Z - prm.Position.Z) - pMass.c.Z); d.GeomSetOffsetWorldRotation(prm.prim_geom, ref mat); //d.GeomSetOffsetRotation(prm.prim_geom, ref mat); - d.MassTranslate(out pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z); + d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z); d.BodySetMass(Body, ref pMass); } else @@ -1069,9 +1069,9 @@ namespace OpenSim.Region.Physics.OdePlugin // (Position.Y - prm.Position.Y) - pMass.c.Y, // (Position.Z - prm.Position.Z) - pMass.c.Z); //d.GeomSetOffsetRotation(prim_geom, ref mat2); - d.MassTranslate(out pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z); + d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z); d.BodySetMass(Body, ref pMass); - + d.BodySetAutoDisableFlag(Body, true); d.BodySetAutoDisableSteps(Body, body_autodisable_frames); diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll old mode 100644 new mode 100755 index 9b6632a..fcf17b1 Binary files a/bin/Ode.NET.dll and b/bin/Ode.NET.dll differ -- cgit v1.1