aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-09-21 02:08:55 +0200
committerMelanie2010-09-21 02:08:55 +0200
commit7229bc4fbda804d41525356027269ca9a665b0bf (patch)
tree16c57e5136a0f2064b95627a5e0e77bb7fe90fe6 /OpenSim/Region/Framework/Scenes
parentFix a merge artefact that broke script state persistence in XAttachments (diff)
downloadopensim-SC-7229bc4fbda804d41525356027269ca9a665b0bf.zip
opensim-SC-7229bc4fbda804d41525356027269ca9a665b0bf.tar.gz
opensim-SC-7229bc4fbda804d41525356027269ca9a665b0bf.tar.bz2
opensim-SC-7229bc4fbda804d41525356027269ca9a665b0bf.tar.xz
Refactor script create permission into the perms module
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs10
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 ac82fda..18cfcbc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1532,16 +1532,6 @@ namespace OpenSim.Region.Framework.Scenes
1532 if (part == null) 1532 if (part == null)
1533 return; 1533 return;
1534 1534
1535 if (part.OwnerID != remoteClient.AgentId)
1536 {
1537 // Group permissions
1538 if ((part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0))
1539 return;
1540 } else {
1541 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
1542 return;
1543 }
1544
1545 if (!Permissions.CanCreateObjectInventory( 1535 if (!Permissions.CanCreateObjectInventory(
1546 itemBase.InvType, part.UUID, remoteClient.AgentId)) 1536 itemBase.InvType, part.UUID, remoteClient.AgentId))
1547 return; 1537 return;