From 13aae75ad88b69c319f86911bac81096510975c1 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Wed, 16 Mar 2011 22:43:49 +0100
Subject: [PATCH] Prevent god users from being stopped logging into a region

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fe111ff592..e5c0f38864 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -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);