aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index c91027c..935c51b 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -637,8 +637,10 @@ namespace OpenSim.Region.Environment.Scenes
637 while (m_partsUpdateQueue.Count > 0) 637 while (m_partsUpdateQueue.Count > 0)
638 { 638 {
639 SceneObjectPart part = m_partsUpdateQueue.Dequeue(); 639 SceneObjectPart part = m_partsUpdateQueue.Dequeue();
640 if (part.ParentGroup == null || part.ParentGroup.RootPart == null) 640
641 if (part.ParentGroup == null || part.ParentGroup.IsDeleted)
641 continue; 642 continue;
643
642 if (m_updateTimes.ContainsKey(part.UUID)) 644 if (m_updateTimes.ContainsKey(part.UUID))
643 { 645 {
644 ScenePartUpdate update = m_updateTimes[part.UUID]; 646 ScenePartUpdate update = m_updateTimes[part.UUID];
@@ -2582,10 +2584,8 @@ namespace OpenSim.Region.Environment.Scenes
2582 if (gobj == null) 2584 if (gobj == null)
2583 return false; 2585 return false;
2584 2586
2585 if (gobj.RootPart == null) 2587 if (gobj.IsDeleted)
2586 {
2587 return false; 2588 return false;
2588 }
2589 } 2589 }
2590 } 2590 }
2591 return true; 2591 return true;
@@ -2598,7 +2598,7 @@ namespace OpenSim.Region.Environment.Scenes
2598 // Validate 2598 // Validate
2599 foreach (SceneObjectGroup gobj in m_attachments) 2599 foreach (SceneObjectGroup gobj in m_attachments)
2600 { 2600 {
2601 if (gobj == null || gobj.RootPart == null) 2601 if (gobj == null || gobj.IsDeleted)
2602 return false; 2602 return false;
2603 } 2603 }
2604 2604