aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-01 22:04:35 +0000
committerJustin Clarke Casey2008-11-01 22:04:35 +0000
commit9366a234cf0dd09c0252f9af8a231c4b2865e556 (patch)
tree12ac4c2e25b048cb0b3962b1f9b3722b8e124126 /OpenSim/Region/Environment/Modules
parentFix a compile warning about unreachable code (diff)
downloadopensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.zip
opensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.gz
opensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.bz2
opensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.xz
* refactor: Convert most non SOP methods to use SOG.IsAttachment rather than SOP.IsAttachment
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs5
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
611 { 611 {
612 if (obj != null) 612 if (obj != null)
613 { 613 {
614 if ((obj is SceneObjectGroup) && ((SceneObjectGroup)obj).RootPart != null && !((SceneObjectGroup)obj).RootPart.IsAttachment) 614 if ((obj is SceneObjectGroup) && !((SceneObjectGroup)obj).IsDeleted && !((SceneObjectGroup)obj).IsAttachment)
615 { 615 {
616 m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj); 616 m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
617 } 617 }
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
757 SceneObjectPart part = scene.GetSceneObjectPart(objectID); 757 SceneObjectPart part = scene.GetSceneObjectPart(objectID);
758 if (part.OwnerID != moverID) 758 if (part.OwnerID != moverID)
759 { 759 {
760 if (part.ParentGroup != null && 760 if (part.ParentGroup != null && !part.ParentGroup.IsDeleted)
761 part.ParentGroup.RootPart != null)
762 { 761 {
763 if (part.ParentGroup.RootPart.IsAttachment) 762 if (part.ParentGroup.IsAttachment)
764 return false; 763 return false;
765 } 764 }
766 } 765 }