Prevent god users from being stopped logging into a region

avinationmerge
Melanie 2011-03-16 22:43:49 +01:00
parent 3dc877c59f
commit 13aae75ad8
1 changed files with 8 additions and 0 deletions

View File

@ -3524,6 +3524,8 @@ namespace OpenSim.Region.Framework.Scenes
private bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
{
reason = String.Empty;
if (Permissions.IsGod(agentID))
return true;
ILandObject land = LandChannel.GetLandObject(posX, posY);
if (land == null)
@ -5165,6 +5167,12 @@ namespace OpenSim.Region.Framework.Scenes
{
reason = "You are banned from the region";
if (Permissions.IsGod(agentID))
{
reason = String.Empty;
return true;
}
if (!AuthorizeUser(agentID, out reason))
{
// m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);