From 2d33bf854f14d7734d70d69304a20c429280d813 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Thu, 3 Apr 2008 04:02:46 +0000 Subject: [PATCH] * ODEPlugin: put a limit on the minimum size a prim can be ( scale <=0 ). --- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 309a7675e1..4e39eb418e 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -160,6 +160,10 @@ namespace OpenSim.Region.Physics.OdePlugin prim_geom = (IntPtr)0; prev_geom = (IntPtr)0; + if (size.X <= 0) size.X = 0.01f; + if (size.Y <= 0) size.Y = 0.01f; + if (size.Z <= 0) size.Z = 0.01f; + _size = size; m_taintsize = _size; _acceleration = new PhysicsVector(); @@ -1296,7 +1300,10 @@ namespace OpenSim.Region.Physics.OdePlugin //} string oldname = _parent_scene.geom_name_map[prim_geom]; - + if (_size.X <= 0) _size.X = 0.01f; + if (_size.Y <= 0) _size.Y = 0.01f; + if (_size.Z <= 0) _size.Z = 0.01f; + // Cleanup of old prim geometry if (_mesh != null) { @@ -1485,7 +1492,9 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomDestroy(prim_geom); prim_geom = (IntPtr) 0; // we don't need to do space calculation because the client sends a position update also. - + if (_size.X <= 0) _size.X = 0.01f; + if (_size.Y <= 0) _size.Y = 0.01f; + if (_size.Z <= 0) _size.Z = 0.01f; // Construction of new prim if (_parent_scene.needsMeshing(_pbs)) { @@ -1964,9 +1973,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (_zeroFlag) { - // Supposedly this is supposed to tell SceneObjectGroup that - // no more updates need to be sent.. - // but it seems broken. + _velocity.X = 0.0f; _velocity.Y = 0.0f; _velocity.Z = 0.0f;