Merge branch 'master' into vehicles

This commit is contained in:
Melanie
2009-10-12 15:11:01 +01:00
14 changed files with 667 additions and 55 deletions

View File

@@ -2940,6 +2940,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{
case ActorTypes.Agent:
OdeCharacter cobj = (OdeCharacter)obj;
cobj.AddCollisionFrameTime(100);
cobj.SendCollisions();
break;
case ActorTypes.Prim: