aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
2 files changed, 11 insertions, 2 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 {
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
2956 } 2956 }
2957 2957
2958 /// <summary> 2958 /// <summary>
2959 /// 2959 /// Handle a request for admin rights
2960 /// </summary> 2960 /// </summary>
2961 /// <param name="agentID"></param> 2961 /// <param name="agentID"></param>
2962 /// <param name="sessionID"></param> 2962 /// <param name="sessionID"></param>