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

* Switch default permissions back to false (so they are not on) as they were two revisions ago, since it sounds like this was our agreed position from some time back 

* Make the default also false (to match what is in OpenSim.ini.example)
0.6.1-post-fixes
Justin Clarke Casey 2008-11-14 15:48:34 +00:00
parent 8372880c75
commit 165fcd1aac
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
#region Bypass Permissions / Debug Permissions Stuff #region Bypass Permissions / Debug Permissions Stuff
// Bypasses the permissions engine // Bypasses the permissions engine
private bool m_bypassPermissions = false; private bool m_bypassPermissions = true;
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;
@ -372,8 +372,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
if (IsEstateManager(user) && m_RegionOwnerIsGod) if (IsEstateManager(user) && m_RegionOwnerIsGod)
return objectOwnerMask; return objectOwnerMask;
// Admin should be able to edit anything in the sim (including admin objects) // Admin should be able to edit anything in the sim (including admin objects)
if (IsAdministrator(user)) if (IsAdministrator(user))
return objectOwnerMask; return objectOwnerMask;
@ -823,13 +821,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
return false; return false;
} }
SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID]; SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID];
UUID objectOwner = group.OwnerID; UUID objectOwner = group.OwnerID;
locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
// This is an exception to the generic object permission. // This is an exception to the generic object permission.
// Administrators who lock their objects should not be able to move them, // Administrators who lock their objects should not be able to move them,
// however generic object permission should return true. // however generic object permission should return true.

3
bin/OpenSim.ini.example
View File

@ -113,7 +113,8 @@
; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy ; 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. ; any item, etc. This may not yet be implemented uniformally.
; If set to true, then all permissions checks are carried out ; If set to true, then all permissions checks are carried out
serverside_object_permissions = true ; Default is false
serverside_object_permissions = false
allow_grid_gods = false allow_grid_gods = false