OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie Thielker 2010-07-17 02:26:34 +02:00
parent 9bf6179d24 236c0f8e8b
commit 85f454e3ae
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
View File

@ -1735,6 +1735,13 @@ namespace OpenSim.Region.Physics.OdePlugin
if (m_isphysical)
{
disableBodySoft();
if (Body != IntPtr.Zero)
{
d.BodySetLinearVel(Body, 0f, 0f, 0f);
d.BodySetForce(Body, 0, 0, 0);
enableBodySoft();
}
}
}
else
@ -1756,6 +1763,7 @@ namespace OpenSim.Region.Physics.OdePlugin
d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
}
/* Uhhh - stop the motion if the object is _selected_!!
if (m_isphysical)
{
if (Body != IntPtr.Zero)
@ -1765,6 +1773,7 @@ namespace OpenSim.Region.Physics.OdePlugin
enableBodySoft();
}
}
*/
}
resetCollisionAccounting();