Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-21 04:03:14 +01:00
16 changed files with 563 additions and 60 deletions

View File

@@ -1532,16 +1532,6 @@ namespace OpenSim.Region.Framework.Scenes
if (part == null)
return;
if (part.OwnerID != remoteClient.AgentId)
{
// Group permissions
if ((part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0))
return;
} else {
if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
return;
}
if (!Permissions.CanCreateObjectInventory(
itemBase.InvType, part.UUID, remoteClient.AgentId))
return;