diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Permissions')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 28e9850..7f567e5 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
64 | // Bypasses the permissions engine | 64 | // Bypasses the permissions engine |
65 | private bool m_bypassPermissions = true; | 65 | private bool m_bypassPermissions = true; |
66 | private bool m_bypassPermissionsValue = true; | 66 | private bool m_bypassPermissionsValue = true; |
67 | private bool m_propagatePermissions = false; | ||
67 | private bool m_debugPermissions = false; | 68 | private bool m_debugPermissions = false; |
68 | private bool m_allowGridGods = false; | 69 | private bool m_allowGridGods = false; |
69 | private bool m_RegionOwnerIsGod = false; | 70 | private bool m_RegionOwnerIsGod = false; |
@@ -143,6 +144,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
143 | 144 | ||
144 | m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); | 145 | m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); |
145 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); | 146 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); |
147 | m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true); | ||
146 | m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); | 148 | m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); |
147 | m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true); | 149 | m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true); |
148 | 150 | ||
@@ -278,7 +280,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
278 | 280 | ||
279 | public bool PropagatePermissions() | 281 | public bool PropagatePermissions() |
280 | { | 282 | { |
281 | return false; | 283 | if (m_bypassPermissions) |
284 | return false; | ||
285 | |||
286 | return m_propagatePermissions; | ||
282 | } | 287 | } |
283 | 288 | ||
284 | public bool BypassPermissions() | 289 | public bool BypassPermissions() |