From 85c0c0557e317b252bcbdf98439a9ec33db17d0c Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 31 Jan 2009 16:49:32 +0000
Subject: * Tweaks some locks when modifying an ODECharacter.  This actually
 allows a user to log-in while the physics scene and the scripts are starting
 up.  This also seems to smooth out the jerks on teleport/connect/disconnect a
 little bit. * If you log-in while the simulator is starting up, you won't be
 able to move and the sim stats will say 0 FPS, and 0 Physics Frames and you
 may see only terrain.  Once the sim finishes starting up, it'll all resume as
 normal.

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

(limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index e45bcda..3adabcf 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1174,6 +1174,9 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (chr == null)
                     continue;
 
+                if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero)
+                    continue;
+
                 chr.IsColliding = false;
                 chr.CollidingGround = false;
                 chr.CollidingObj = false;
-- 
cgit v1.1