Resolve merge commits, stage 1

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index f04ed4d..501487a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     SceneObjectPart part = m_partsUpdateQueue.Dequeue();
                     
-                    if (part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                    if (part.ParentGroup.IsDeleted)
                         continue;
                     
                     if (m_updateTimes.ContainsKey(part.UUID))
@@ -120,8 +120,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // We deal with the possibility that two updates occur at
                         // the same unix time at the update point itself.
 
-                        if ((update.LastFullUpdateTime < part.TimeStampFull) ||
-                                part.IsAttachment)
+                        if ((update.LastFullUpdateTime < part.TimeStampFull) || part.ParentGroup.IsAttachment)
                         {
     //                            m_log.DebugFormat(
     //                                "[SCENE PRESENCE]: Fully   updating prim {0}, {1} - part timestamp {2}",