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

* Put an info entry in the log if permissions are being bypassed 

* might help to diagnose mantis 1712
0.6.0-stable
Justin Clarke Casey 2008-07-11 16:03:12 +00:00
parent 1472cee72f
commit 8535cb52e0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
// Bypasses the permissions engine
private bool m_bypassPermissions = false;
private bool m_bypassPermissionsValue = true;
private bool m_debugPermissions = false;
private bool m_debugPermissions = true;
#endregion
@ -138,6 +138,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
if (m_bypassPermissions)
m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks");
else
m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");
//Register functions with Scene External Checks!
m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED
m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED
@ -226,6 +231,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
protected bool IsAdministrator(LLUUID user)
{
// m_log.DebugFormat(
// "[PERMISSIONS]: Is adminstrator called for {0} where region master avatar is {1}",
// user, m_scene.RegionInfo.MasterAvatarAssignedUUID);
// If there is no master avatar, return false
if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
{

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -2956,7 +2956,7 @@ namespace OpenSim.Region.Environment.Scenes
}
/// <summary>
///
/// Handle a request for admin rights
/// </summary>
/// <param name="agentID"></param>
/// <param name="sessionID"></param>