diff options
| author | Melanie Thielker | 2009-04-28 22:53:10 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-04-28 22:53:10 +0000 |
| commit | 7e972b304b08619884d9581e126a7722800d20b9 (patch) | |
| tree | 8f76467158996e5820abb77af50b0805380aa2bc /OpenSim/Region | |
| parent | * Get rid of some extraneous debug log output from the last commit (diff) | |
| download | opensim-SC-7e972b304b08619884d9581e126a7722800d20b9.zip opensim-SC-7e972b304b08619884d9581e126a7722800d20b9.tar.gz opensim-SC-7e972b304b08619884d9581e126a7722800d20b9.tar.bz2 opensim-SC-7e972b304b08619884d9581e126a7722800d20b9.tar.xz | |
Let estate owners and managers enter nonpublic estates unconditionally.
Let gods go to nonpublic estates as well.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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); |