diff options
author | Melanie Thielker | 2008-09-22 12:52:56 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-22 12:52:56 +0000 |
commit | d7a98925ce5693f28ef48e4228680f3a7aba12af (patch) | |
tree | 2e20488ce767f98b586593b434d21e0b9e398d27 /OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |
parent | cleanups in inventory REST code. also, disables digest authentications (diff) | |
download | opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.zip opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.tar.gz opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.tar.bz2 opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.tar.xz |
Create CanEditObjectInventory to preserve the ability
to have different permissions on inventory and object
edits. This may be needed by the viewer on public grids
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 3b4819b..1a36315 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -163,6 +163,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
163 | m_scene.ExternalChecks.addCheckDuplicateObject(CanDuplicateObject); //FULLY IMPLEMENTED | 163 | m_scene.ExternalChecks.addCheckDuplicateObject(CanDuplicateObject); //FULLY IMPLEMENTED |
164 | m_scene.ExternalChecks.addCheckDeleteObject(CanDeleteObject); //MAYBE FULLY IMPLEMENTED | 164 | m_scene.ExternalChecks.addCheckDeleteObject(CanDeleteObject); //MAYBE FULLY IMPLEMENTED |
165 | m_scene.ExternalChecks.addCheckEditObject(CanEditObject);//MAYBE FULLY IMPLEMENTED | 165 | m_scene.ExternalChecks.addCheckEditObject(CanEditObject);//MAYBE FULLY IMPLEMENTED |
166 | m_scene.ExternalChecks.addCheckEditObject(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED | ||
166 | m_scene.ExternalChecks.addCheckEditParcel(CanEditParcel); //FULLY IMPLEMENTED | 167 | m_scene.ExternalChecks.addCheckEditParcel(CanEditParcel); //FULLY IMPLEMENTED |
167 | m_scene.ExternalChecks.addCheckEditScript(CanEditScript); //NOT YET IMPLEMENTED | 168 | m_scene.ExternalChecks.addCheckEditScript(CanEditScript); //NOT YET IMPLEMENTED |
168 | m_scene.ExternalChecks.addCheckEditNotecard(CanEditNotecard); //NOT YET IMPLEMENTED | 169 | m_scene.ExternalChecks.addCheckEditNotecard(CanEditNotecard); //NOT YET IMPLEMENTED |
@@ -602,6 +603,25 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
602 | return GenericObjectPermission(editorID, objectID, false); | 603 | return GenericObjectPermission(editorID, objectID, false); |
603 | } | 604 | } |
604 | 605 | ||
606 | private bool CanEditObjectInventory(UUID objectID, UUID editorID, Scene scene) | ||
607 | { | ||
608 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | ||
609 | if (m_bypassPermissions) return m_bypassPermissionsValue; | ||
610 | |||
611 | SceneObjectPart part = m_scene.GetSceneObjectPart(objectID); | ||
612 | |||
613 | // Commented because this behavior causes issues for IBM | ||
614 | // With this commented, strange viewer issues can be observed | ||
615 | // when trying to edit scripts and/or notecards in | ||
616 | // "Hacked god mode" | ||
617 | // TODO: add group support! | ||
618 | // | ||
619 | // if(part.OwnerID != editorID) | ||
620 | // return false; | ||
621 | |||
622 | return GenericObjectPermission(editorID, objectID, false); | ||
623 | } | ||
624 | |||
605 | private bool CanEditParcel(UUID user, ILandObject parcel, Scene scene) | 625 | private bool CanEditParcel(UUID user, ILandObject parcel, Scene scene) |
606 | { | 626 | { |
607 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 627 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |