OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch for Adam: Add two new permissions options to Opensim.ini.example 

and the permissions module
0.6.0-stable
Melanie Thielker 2008-08-17 05:05:06 +00:00
parent 910f9d10d6
commit 1db8f6fbad
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -66,6 +66,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
private bool m_bypassPermissionsValue = true; private bool m_bypassPermissionsValue = true;
private bool m_debugPermissions = false; private bool m_debugPermissions = false;
private bool m_allowGridGods = false; private bool m_allowGridGods = false;
private bool m_RegionOwnerIsGod = false;
private bool m_ParcelOwnerIsGod = false;
#endregion #endregion
@ -142,6 +144,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false);
m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true);
if (m_bypassPermissions) if (m_bypassPermissions)
m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks"); m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks");
@ -238,7 +242,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
{ {
if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
{ {
if (m_scene.RegionInfo.MasterAvatarAssignedUUID == user) if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user))
return true; return true;
} }
if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
@ -346,7 +350,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
// Users should be able to edit what is over their land. // Users should be able to edit what is over their land.
ILandObject parcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y); ILandObject parcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
if (parcel != null && parcel.landData.OwnerID == user) if (parcel != null && parcel.landData.OwnerID == user && m_ParcelOwnerIsGod)
return objectOwnerMask; return objectOwnerMask;
// Admin objects should not be editable by the above // Admin objects should not be editable by the above
@ -354,7 +358,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
return objectEveryoneMask; return objectEveryoneMask;
// Estate users should be able to edit anything in the sim // Estate users should be able to edit anything in the sim
if (IsEstateManager(user)) if (IsEstateManager(user) && m_RegionOwnerIsGod)
return objectOwnerMask; return objectOwnerMask;

4
bin/OpenSim.ini.example
View File

@ -90,6 +90,10 @@ shutdown_console_commands_file = "shutdown_commands.txt"
;permissionmodules = "DefaultPermissionsModule" ;permissionmodules = "DefaultPermissionsModule"
serverside_object_permissions = false serverside_object_permissions = false
allow_grid_gods = false allow_grid_gods = false
; This allows somne control over permissions
; please note that this still doesn't duplicate SL, and is not intended to
;region_owner_is_god = true
;parcel_owner_is_god = true
; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true. ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
physical_prim = true physical_prim = true