OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Let estate owners and managers enter nonpublic estates unconditionally. 

Let gods go to nonpublic estates as well.
0.6.5-rc1
Melanie Thielker 2009-04-28 22:53:10 +00:00
parent cac6971099
commit 7e972b304b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/EstateSettings.cs
View File

@ -360,6 +360,9 @@ namespace OpenSim.Framework
public bool HasAccess(UUID user) public bool HasAccess(UUID user)
{ {
if (IsEstateManager(user))
return true;
return l_EstateAccess.Contains(user); return l_EstateAccess.Contains(user);
} }

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1848,14 +1848,14 @@ namespace OpenSim.Region.Framework.Scenes
{ {
bool welcome = true; 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", 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.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region."); client.SendAlertMessage("Denied access to region " + RegionInfo.RegionName + ". You have been banned from that region.");
welcome = false; 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", 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); client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);