From 55cce6aee01e87ccc6e670831e571473ed94f1b5 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 12 Nov 2015 22:40:55 +0000 Subject: [PATCH] minor: reset character collision flags, even if without a Body --- OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index 10a5588e5d..61e31a1b0f 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs @@ -1131,12 +1131,16 @@ namespace OpenSim.Region.PhysicsModule.ubOde { foreach (OdeCharacter chr in _characters) { - if (chr == null || chr.Body == IntPtr.Zero || chr.collider == IntPtr.Zero ) + if (chr == null) continue; chr.IsColliding = false; - // chr.CollidingGround = false; not done here + // chr.CollidingGround = false; not done here chr.CollidingObj = false; + + if(chr.Body == IntPtr.Zero || chr.collider == IntPtr.Zero ) + continue; + // do colisions with static space d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback);