Applied the changes to PermissionsModule.cs from trunk revision 7301 (which was a patch from Christopher Yeoh's (IBM)) so that permissions are propagated when giving Inventory items to other users.

0.6.0-stable
MW 2008-12-15 18:45:02 +00:00
parent 648de85737
commit d19212c3e4
1 changed files with 6 additions and 1 deletions

View File

@ -64,6 +64,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
// Bypasses the permissions engine // Bypasses the permissions engine
private bool m_bypassPermissions = false; private bool m_bypassPermissions = false;
private bool m_bypassPermissionsValue = true; private bool m_bypassPermissionsValue = true;
private bool m_propagatePermissions = false;
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_RegionOwnerIsGod = false;
@ -144,6 +145,7 @@ 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_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true); m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true);
@ -276,7 +278,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
public bool PropagatePermissions() public bool PropagatePermissions()
{ {
if (m_bypassPermissions)
return false; return false;
return m_propagatePermissions;
} }
public bool BypassPermissions() public bool BypassPermissions()