aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-06-08 17:36:41 +0000
committerCharles Krinke2008-06-08 17:36:41 +0000
commitaca872499f2b1c28341cea8df7d8386a691cea43 (patch)
tree5856940b43d1c0c8fa368549d2b6a0edd86d3254 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parentMantis#1498. Thank you Melanie for an XEngine patch that addresses: (diff)
downloadopensim-SC_OLD-aca872499f2b1c28341cea8df7d8386a691cea43.zip
opensim-SC_OLD-aca872499f2b1c28341cea8df7d8386a691cea43.tar.gz
opensim-SC_OLD-aca872499f2b1c28341cea8df7d8386a691cea43.tar.bz2
opensim-SC_OLD-aca872499f2b1c28341cea8df7d8386a691cea43.tar.xz
Added a "if(entity != null)" before the call to
UpdateEntityMovement() to try to preclude the occaisional System.NullReferenceException in scene.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
1 files changed, 3 insertions, 1 deletions
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
174 174
175 foreach (EntityBase entity in moveEntities) 175 foreach (EntityBase entity in moveEntities)
176 { 176 {
177 entity.UpdateMovement(); 177 if(entity != null)entity.UpdateMovement();
178 //cfk. This throws occaisional exceptions on a heavily used region
179 //and I added this null check to try to preclude the exception.
178 } 180 }
179 } 181 }
180 182