From 01878b886cdf2133a1bea37f683a427301f89f44 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 6 Sep 2008 00:44:50 +0000
Subject: * Fix mantis 2130 - nre occuring sometimes when the regular prim
 update sweep occurs * Fold m_deleted and m_isDeleted together (ugh!)

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

(limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 3fa1825d..6b002fc 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -142,7 +142,8 @@ namespace OpenSim.Region.Environment.Scenes
 
             foreach (EntityBase entity in updateEntities)
             {
-                entity.Update();
+                if (!entity.IsDeleted)                        				
+					entity.Update();
             }
         }
 
-- 
cgit v1.1