aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-02-16 05:22:05 +0100
committerMelanie2011-02-16 05:22:05 +0100
commitcfce0aa4482c50e3046ae44fe76d71fb70c82201 (patch)
tree41ce0f2a9b7ee144827eb5620cdba8a0db0f4245 /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-cfce0aa4482c50e3046ae44fe76d71fb70c82201.zip
opensim-SC_OLD-cfce0aa4482c50e3046ae44fe76d71fb70c82201.tar.gz
opensim-SC_OLD-cfce0aa4482c50e3046ae44fe76d71fb70c82201.tar.bz2
opensim-SC_OLD-cfce0aa4482c50e3046ae44fe76d71fb70c82201.tar.xz
Change the QUERYACCESS method to eliminate spurious access denied messages
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 171d637..f38a6fc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5145,9 +5145,9 @@ namespace OpenSim.Region.Framework.Scenes
5145 // from logging into the region, teleporting into the region 5145 // from logging into the region, teleporting into the region
5146 // or corssing the broder walking, but will NOT prevent 5146 // or corssing the broder walking, but will NOT prevent
5147 // child agent creation, thereby emulating the SL behavior. 5147 // child agent creation, thereby emulating the SL behavior.
5148 public bool QueryAccess(UUID agentID, Vector3 position) 5148 public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
5149 { 5149 {
5150 string reason; 5150 reason = "You are banned from the region";
5151 5151
5152 if (!AuthorizeUser(agentID, out reason)) 5152 if (!AuthorizeUser(agentID, out reason))
5153 { 5153 {
@@ -5178,6 +5178,8 @@ namespace OpenSim.Region.Framework.Scenes
5178 if (banned || restricted) 5178 if (banned || restricted)
5179 return false; 5179 return false;
5180 } 5180 }
5181
5182 reason = String.Empty;
5181 return true; 5183 return true;
5182 } 5184 }
5183 } 5185 }