From 8372880c75af4dd9c4dced98010be3d5fb1859a5 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 14 Nov 2008 15:36:46 +0000 Subject: [PATCH] * Hook up create new object event in the permissions module * Switch default for serverside_object_permissions from false to true - it seems more natural that we enforce permissions by default rather than not! * Add some explanation in OpenSim.ini.example for serverside_object_permissions --- .../Modules/World/Permissions/PermissionsModule.cs | 3 ++- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 +- bin/OpenSim.ini.example | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 87348fc3e0..fe6256f2dc 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -162,7 +162,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions m_scene.ExternalChecks.addCheckDuplicateObject(CanDuplicateObject); //FULLY IMPLEMENTED m_scene.ExternalChecks.addCheckDeleteObject(CanDeleteObject); //MAYBE FULLY IMPLEMENTED m_scene.ExternalChecks.addCheckEditObject(CanEditObject);//MAYBE FULLY IMPLEMENTED - m_scene.ExternalChecks.addCheckEditObjectInventory(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED m_scene.ExternalChecks.addCheckEditParcel(CanEditParcel); //FULLY IMPLEMENTED m_scene.ExternalChecks.addCheckEditScript(CanEditScript); //NOT YET IMPLEMENTED m_scene.ExternalChecks.addCheckEditNotecard(CanEditNotecard); //NOT YET IMPLEMENTED @@ -184,6 +183,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions m_scene.ExternalChecks.addCheckCanLinkObject(CanLinkObject); //NOT YET IMPLEMENTED m_scene.ExternalChecks.addCheckCanDelinkObject(CanDelinkObject); //NOT YET IMPLEMENTED m_scene.ExternalChecks.addCheckCanBuyLand(CanBuyLand); //NOT YET IMPLEMENTED + m_scene.ExternalChecks.addCheckCanCreateObjectInventory(CanCreateObjectInventory); //NOT IMPLEMENTED HERE + m_scene.ExternalChecks.addCheckEditObjectInventory(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED m_scene.ExternalChecks.addCheckCanCopyObjectInventory(CanCopyObjectInventory); //NOT YET IMPLEMENTED m_scene.ExternalChecks.addCheckCanDeleteObjectInventory(CanDeleteObjectInventory); //NOT YET IMPLEMENTED m_scene.ExternalChecks.addCheckCanCreateUserInventory(CanCreateUserInventory); //NOT YET IMPLEMENTED diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 12095e52af..687a2255ee 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1326,7 +1326,7 @@ namespace OpenSim.Region.Environment.Scenes UUID itemID = itemBase.ID; UUID copyID = UUID.Random(); - if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's pinventory + if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory { CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index a529a489a4..b544be745c 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -109,7 +109,12 @@ ; ## ;permissionmodules = "DefaultPermissionsModule" - serverside_object_permissions = false + + ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy + ; any item, etc. This may not yet be implemented uniformally. + ; If set to true, then all permissions checks are carried out + serverside_object_permissions = true + allow_grid_gods = false ; This allows somne control over permissions