Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fe111ff..e5c0f38 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);