OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged Trunk Revisions 7738, 7739 and 7740 to 0.6.0-stable branch. Fix some permission bugs

0.6.0-stable
MW 2008-12-17 13:46:39 +00:00
parent 17673df6f7
commit 9eced15408
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -591,6 +591,17 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
//They can't even edit the object //They can't even edit the object
return false; return false;
} }
SceneObjectPart part = scene.GetSceneObjectPart(objectID);
if (part == null)
return false;
if ((part.OwnerMask & PERM_COPY) == 0)
return false;
if ((part.ParentGroup.GetEffectivePermissions() & PERM_COPY) == 0)
return false;
//If they can rez, they can duplicate //If they can rez, they can duplicate
return CanRezObject(objectCount, owner, objectPosition, scene); return CanRezObject(objectCount, owner, objectPosition, scene);
} }
@ -988,7 +999,18 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)
permission = true; permission = true;
if ((task.GetEffectivePermissions() & PERM_COPY) == 0)
permission = false;
} }
else
{
SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
if ((task.GetEffectivePermissions() & PERM_COPY) == 0)
permission = false;
}
return permission; return permission;
} }