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

*Fixed bug causing Object Duplication to not correctly follow permissions

0.6.0-stable
mingchen 2008-05-07 21:52:11 +00:00
parent 28e6e018a2
commit e364c64583
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,7 +502,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
public virtual bool CanCopyObject(LLUUID user, LLUUID obj) public virtual bool CanCopyObject(LLUUID user, LLUUID obj)
{ {
bool permission = GenericObjectPermission(user, obj); bool permission = GenericObjectPermission(user, obj);
if (!permission) if (permission)
{ {
if (!m_scene.Entities.ContainsKey(obj)) if (!m_scene.Entities.ContainsKey(obj))
{ {
@ -520,6 +520,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
// Added this because at this point in time it wouldn't be wise for // Added this because at this point in time it wouldn't be wise for
// the administrator object permissions to take effect. // the administrator object permissions to take effect.
LLUUID objectOwner = task.OwnerID; LLUUID objectOwner = task.OwnerID;
//Check ExternalChecks!
if (m_scene.ExternalChecks.ExternalChecksCanRezObject(task.Children.Count, objectOwner, task.GroupCentrePoint) == false) return false;
if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)
permission = true; permission = true;
} }