aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 10a5588..61e31a1 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -1131,12 +1131,16 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1131 { 1131 {
1132 foreach (OdeCharacter chr in _characters) 1132 foreach (OdeCharacter chr in _characters)
1133 { 1133 {
1134 if (chr == null || chr.Body == IntPtr.Zero || chr.collider == IntPtr.Zero ) 1134 if (chr == null)
1135 continue; 1135 continue;
1136 1136
1137 chr.IsColliding = false; 1137 chr.IsColliding = false;
1138 // chr.CollidingGround = false; not done here 1138 // chr.CollidingGround = false; not done here
1139 chr.CollidingObj = false; 1139 chr.CollidingObj = false;
1140
1141 if(chr.Body == IntPtr.Zero || chr.collider == IntPtr.Zero )
1142 continue;
1143
1140 // do colisions with static space 1144 // do colisions with static space
1141 d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback); 1145 d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback);
1142 1146