aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/EstateSettings.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 14bb9ef..4f34757 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -360,6 +360,9 @@ namespace OpenSim.Framework
360 360
361 public bool HasAccess(UUID user) 361 public bool HasAccess(UUID user)
362 { 362 {
363 if (IsEstateManager(user))
364 return true;
365
363 return l_EstateAccess.Contains(user); 366 return l_EstateAccess.Contains(user);
364 } 367 }
365 368
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
1848 { 1848 {
1849 bool welcome = true; 1849 bool welcome = true;
1850 1850
1851 if(m_regInfo.EstateSettings.IsBanned(client.AgentId)) 1851 if(m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId)))
1852 { 1852 {
1853 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", 1853 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
1854 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName); 1854 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
1855 client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region."); 1855 client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region.");
1856 welcome = false; 1856 welcome = false;
1857 } 1857 }
1858 else if (!m_regInfo.EstateSettings.PublicAccess && !m_regInfo.EstateSettings.HasAccess(client.AgentId)) 1858 else if (!m_regInfo.EstateSettings.PublicAccess && !m_regInfo.EstateSettings.HasAccess(client.AgentId) && !Permissions.IsGod(client.AgentId))
1859 { 1859 {
1860 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access", 1860 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access",
1861 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName); 1861 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);