From 7e972b304b08619884d9581e126a7722800d20b9 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 28 Apr 2009 22:53:10 +0000 Subject: Let estate owners and managers enter nonpublic estates unconditionally. Let gods go to nonpublic estates as well. --- OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8d134df..73daab8 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1848,14 +1848,14 @@ namespace OpenSim.Region.Framework.Scenes { bool welcome = true; - if(m_regInfo.EstateSettings.IsBanned(client.AgentId)) + if(m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId))) { m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName); client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region."); welcome = false; } - else if (!m_regInfo.EstateSettings.PublicAccess && !m_regInfo.EstateSettings.HasAccess(client.AgentId)) + else if (!m_regInfo.EstateSettings.PublicAccess && !m_regInfo.EstateSettings.HasAccess(client.AgentId) && !Permissions.IsGod(client.AgentId)) { m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access", client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName); -- cgit v1.1