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.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 9a720d9..ef98599 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -236,7 +236,15 @@ namespace OpenSim.Region.Environment.Scenes
236 // Don't abort the whole update if one entity happens to give us an exception. 236 // Don't abort the whole update if one entity happens to give us an exception.
237 try 237 try
238 { 238 {
239 m_updateList[i].Update(); 239 // A null name signals that this group was deleted before the scheduled update
240 // FIXME: This is merely a temporary measure to reduce the incidence of failure, when
241 // an object has been deleted from a scene before update was processed.
242 // A more fundamental overhaul of the update mechanism is required to eliminate all
243 // the race conditions.
244 if (entity.Name != null)
245 {
246 m_updateList[i].Update();
247 }
240 } 248 }
241 catch (Exception e) 249 catch (Exception e)
242 { 250 {