aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
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
3524 private bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY) 3524 private bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
3525 { 3525 {
3526 reason = String.Empty; 3526 reason = String.Empty;
3527 if (Permissions.IsGod(agentID))
3528 return true;
3527 3529
3528 ILandObject land = LandChannel.GetLandObject(posX, posY); 3530 ILandObject land = LandChannel.GetLandObject(posX, posY);
3529 if (land == null) 3531 if (land == null)
@@ -5165,6 +5167,12 @@ namespace OpenSim.Region.Framework.Scenes
5165 { 5167 {
5166 reason = "You are banned from the region"; 5168 reason = "You are banned from the region";
5167 5169
5170 if (Permissions.IsGod(agentID))
5171 {
5172 reason = String.Empty;
5173 return true;
5174 }
5175
5168 if (!AuthorizeUser(agentID, out reason)) 5176 if (!AuthorizeUser(agentID, out reason))
5169 { 5177 {
5170 // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); 5178 // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);