diff options
author | Jeff Ames | 2009-06-09 18:07:35 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-09 18:07:35 +0000 |
commit | a7fcacf8f396acbca0b640a65acfbf5487d513e7 (patch) | |
tree | 5ba66f5c83eceeb81e24a0540ae4fac9847e0c78 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Update svn properties. (diff) | |
download | opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.zip opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.gz opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.bz2 opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.xz |
Formatting cleanup. Ignore some generated files.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a2a7392..8e3c688 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1526,14 +1526,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1526 | return; | 1526 | return; |
1527 | 1527 | ||
1528 | if (part.OwnerID != remoteClient.AgentId) | 1528 | if (part.OwnerID != remoteClient.AgentId) |
1529 | { | 1529 | { |
1530 | // Group permissions | 1530 | // Group permissions |
1531 | if ( (part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0) ) | 1531 | if ((part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0)) |
1532 | return; | 1532 | return; |
1533 | } else { | 1533 | } else { |
1534 | if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) | 1534 | if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) |
1535 | return; | 1535 | return; |
1536 | } | 1536 | } |
1537 | 1537 | ||
1538 | if (!Permissions.CanCreateObjectInventory( | 1538 | if (!Permissions.CanCreateObjectInventory( |
1539 | itemBase.InvType, part.UUID, remoteClient.AgentId)) | 1539 | itemBase.InvType, part.UUID, remoteClient.AgentId)) |
@@ -1602,18 +1602,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
1602 | destId); | 1602 | destId); |
1603 | return; | 1603 | return; |
1604 | } | 1604 | } |
1605 | 1605 | ||
1606 | // Must own the object, and have modify rights | 1606 | // Must own the object, and have modify rights |
1607 | if (srcPart.OwnerID != destPart.OwnerID) | 1607 | if (srcPart.OwnerID != destPart.OwnerID) |
1608 | { | 1608 | { |
1609 | // Group permissions | 1609 | // Group permissions |
1610 | if ( (destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) || | 1610 | if ((destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) || |
1611 | ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0) ) | 1611 | ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0)) |
1612 | return; | 1612 | return; |
1613 | } else { | 1613 | } else { |
1614 | if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0) | 1614 | if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0) |
1615 | return; | 1615 | return; |
1616 | } | 1616 | } |
1617 | 1617 | ||
1618 | if (destPart.ScriptAccessPin != pin) | 1618 | if (destPart.ScriptAccessPin != pin) |
1619 | { | 1619 | { |