From 8535cb52e0c837f15f8900ce8d6a4605109e56f8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 11 Jul 2008 16:03:12 +0000
Subject: * Put an info entry in the log if permissions are being bypassed *
 might help to diagnose mantis 1712

---
 .../Modules/World/Permissions/PermissionsModule.cs            | 11 ++++++++++-
 OpenSim/Region/Environment/Scenes/Scene.cs                    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
         // 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
 
@@ -137,6 +137,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 return;
 
             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
@@ -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)
             {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3c8df33..d6bbb1f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -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>
-- 
cgit v1.1