diff options
author | Justin Clarke Casey | 2008-07-11 16:03:12 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-11 16:03:12 +0000 |
commit | 8535cb52e0c837f15f8900ce8d6a4605109e56f8 (patch) | |
tree | 35af97eb40f4b260c471d902d48bcd9199f7a830 /OpenSim/Region/Environment/Modules | |
parent | Mantis#1005. Thank you kindly, Mircea for a two patches that: (diff) | |
download | opensim-SC-8535cb52e0c837f15f8900ce8d6a4605109e56f8.zip opensim-SC-8535cb52e0c837f15f8900ce8d6a4605109e56f8.tar.gz opensim-SC-8535cb52e0c837f15f8900ce8d6a4605109e56f8.tar.bz2 opensim-SC-8535cb52e0c837f15f8900ce8d6a4605109e56f8.tar.xz |
* Put an info entry in the log if permissions are being bypassed
* might help to diagnose mantis 1712
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 6cf2f29..7e0d0e1 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
62 | // Bypasses the permissions engine | 62 | // Bypasses the permissions engine |
63 | private bool m_bypassPermissions = false; | 63 | private bool m_bypassPermissions = false; |
64 | private bool m_bypassPermissionsValue = true; | 64 | private bool m_bypassPermissionsValue = true; |
65 | private bool m_debugPermissions = false; | 65 | private bool m_debugPermissions = true; |
66 | 66 | ||
67 | #endregion | 67 | #endregion |
68 | 68 | ||
@@ -137,6 +137,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
137 | return; | 137 | return; |
138 | 138 | ||
139 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); | 139 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); |
140 | |||
141 | if (m_bypassPermissions) | ||
142 | m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks"); | ||
143 | else | ||
144 | m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks"); | ||
140 | 145 | ||
141 | //Register functions with Scene External Checks! | 146 | //Register functions with Scene External Checks! |
142 | m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED | 147 | m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED |
@@ -226,6 +231,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
226 | 231 | ||
227 | protected bool IsAdministrator(LLUUID user) | 232 | protected bool IsAdministrator(LLUUID user) |
228 | { | 233 | { |
234 | // m_log.DebugFormat( | ||
235 | // "[PERMISSIONS]: Is adminstrator called for {0} where region master avatar is {1}", | ||
236 | // user, m_scene.RegionInfo.MasterAvatarAssignedUUID); | ||
237 | |||
229 | // If there is no master avatar, return false | 238 | // If there is no master avatar, return false |
230 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) | 239 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) |
231 | { | 240 | { |