diff options
| author | Justin Clark-Casey (justincc) | 2010-09-25 00:00:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-25 00:00:00 +0100 |
| commit | b366ad5012e6c6be5de2b1449a7b2e94332ef6e3 (patch) | |
| tree | e04030a305e9ca92179deb89b641f4968acee6c1 /OpenSim/Region/Framework | |
| parent | If the uuid gatherer fails to find the asset containing gesture metadata, the... (diff) | |
| parent | Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() functio... (diff) | |
| download | opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.zip opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.gz opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.bz2 opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8011154..d3a1447 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1533,16 +1533,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1533 | if (part == null) | 1533 | if (part == null) |
| 1534 | return; | 1534 | return; |
| 1535 | 1535 | ||
| 1536 | if (part.OwnerID != remoteClient.AgentId) | ||
| 1537 | { | ||
| 1538 | // Group permissions | ||
| 1539 | if ((part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0)) | ||
| 1540 | return; | ||
| 1541 | } else { | ||
| 1542 | if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) | ||
| 1543 | return; | ||
| 1544 | } | ||
| 1545 | |||
| 1546 | if (!Permissions.CanCreateObjectInventory( | 1536 | if (!Permissions.CanCreateObjectInventory( |
| 1547 | itemBase.InvType, part.UUID, remoteClient.AgentId)) | 1537 | itemBase.InvType, part.UUID, remoteClient.AgentId)) |
| 1548 | return; | 1538 | return; |