* refactor: Convert most non SOP methods to use SOG.IsAttachment rather than SOP.IsAttachment

2 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index d595185..a23ec4d 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
                 {
                     if (obj != null)
                     {
-                        if ((obj is SceneObjectGroup) && ((SceneObjectGroup)obj).RootPart != null && !((SceneObjectGroup)obj).RootPart.IsAttachment)
+                        if ((obj is SceneObjectGroup) && !((SceneObjectGroup)obj).IsDeleted && !((SceneObjectGroup)obj).IsAttachment)
                         {
                             m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
                         }
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index b6a0c23..0585213 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -757,10 +757,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                     SceneObjectPart part = scene.GetSceneObjectPart(objectID);
                     if (part.OwnerID != moverID)
                     {
-                        if (part.ParentGroup != null &&
-                            part.ParentGroup.RootPart != null)
+                        if (part.ParentGroup != null && !part.ParentGroup.IsDeleted)
                         {
-                            if (part.ParentGroup.RootPart.IsAttachment)
+                            if (part.ParentGroup.IsAttachment)
                                 return false;
                         }
                     }