aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs15
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 51ee4d0..658478d 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -141,9 +141,8 @@ namespace OpenSim.Region.Environment.Scenes
141 List<EntityBase> updateEntities = GetEntities(); 141 List<EntityBase> updateEntities = GetEntities();
142 142
143 foreach (EntityBase entity in updateEntities) 143 foreach (EntityBase entity in updateEntities)
144 { 144 {
145 if (!entity.IsDeleted) 145 entity.Update();
146 entity.Update();
147 } 146 }
148 } 147 }
149 148
@@ -327,15 +326,7 @@ namespace OpenSim.Region.Environment.Scenes
327 // Don't abort the whole update if one entity happens to give us an exception. 326 // Don't abort the whole update if one entity happens to give us an exception.
328 try 327 try
329 { 328 {
330 // Check that the group was not deleted before the scheduled update 329 m_updateList[i].Update();
331 // FIXME: This is merely a temporary measure to reduce the incidence of failure, when
332 // an object has been deleted from a scene before update was processed.
333 // A more fundamental overhaul of the update mechanism is required to eliminate all
334 // the race conditions.
335 if (!entity.IsDeleted)
336 {
337 m_updateList[i].Update();
338 }
339 } 330 }
340 catch (Exception e) 331 catch (Exception e)
341 { 332 {