From aca872499f2b1c28341cea8df7d8386a691cea43 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Sun, 8 Jun 2008 17:36:41 +0000
Subject: Added a "if(entity != null)" before the call to
 UpdateEntityMovement() to try to preclude the occaisional
 System.NullReferenceException in scene.

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index f04ce7f..b3663b7 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -174,7 +174,9 @@ namespace OpenSim.Region.Environment.Scenes
 
             foreach (EntityBase entity in moveEntities)
             {
-                entity.UpdateMovement();
+                if(entity != null)entity.UpdateMovement();
+                //cfk. This throws occaisional exceptions on a heavily used region
+                //and I added this null check to try to preclude the exception.
             }
         }
 
-- 
cgit v1.1