ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-11-01 22:04:35 +00:00
parent 44e377d1fb
commit 9366a234cf
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
View File

@@ -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);
}

5
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@@ -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;
}
}