From 6f0e068cf18aa17ecbcc704ad957f6311727875c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Nov 2008 20:04:41 +0000
Subject: Guard against a strange nullref in ODE

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 84bf54f..9da49f7 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1099,6 +1099,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                 // Reset the collision values to false
                 // since we don't know if we're colliding yet
 
+                // For some reason this can happen. Don't ask...
+                //
+                if (chr == null)
+                    continue;
+
                 chr.IsColliding = false;
                 chr.CollidingGround = false;
                 chr.CollidingObj = false;
-- 
cgit v1.1