aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2013-07-24 11:42:35 -0700
committerDiva Canto2013-07-24 12:49:30 -0700
commit00d4a26eefafbe078af78458c9ca58931e29ecb9 (patch)
treeab569591f566d652c45ad6920eb16b96f012a9d6 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-00d4a26eefafbe078af78458c9ca58931e29ecb9.zip
opensim-SC_OLD-00d4a26eefafbe078af78458c9ca58931e29ecb9.tar.gz
opensim-SC_OLD-00d4a26eefafbe078af78458c9ca58931e29ecb9.tar.bz2
opensim-SC_OLD-00d4a26eefafbe078af78458c9ca58931e29ecb9.tar.xz
Amend previous commit.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e443c1d..f766140 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3739,7 +3739,7 @@ namespace OpenSim.Region.Framework.Scenes
3739 3739
3740 try 3740 try
3741 { 3741 {
3742 if (!AuthorizeUser(agent, out reason)) 3742 if (!AuthorizeUser(agent, SeeIntoRegion, out reason))
3743 { 3743 {
3744 m_authenticateHandler.RemoveCircuit(agent.circuitcode); 3744 m_authenticateHandler.RemoveCircuit(agent.circuitcode);
3745 return false; 3745 return false;
@@ -3979,7 +3979,7 @@ namespace OpenSim.Region.Framework.Scenes
3979 /// <param name="reason">outputs the reason to this string</param> 3979 /// <param name="reason">outputs the reason to this string</param>
3980 /// <returns>True if the region accepts this agent. False if it does not. False will 3980 /// <returns>True if the region accepts this agent. False if it does not. False will
3981 /// also return a reason.</returns> 3981 /// also return a reason.</returns>
3982 protected virtual bool AuthorizeUser(AgentCircuitData agent, out string reason) 3982 protected virtual bool AuthorizeUser(AgentCircuitData agent, bool bypassAccessControl, out string reason)
3983 { 3983 {
3984 reason = String.Empty; 3984 reason = String.Empty;
3985 3985
@@ -4018,7 +4018,7 @@ namespace OpenSim.Region.Framework.Scenes
4018 // child agents from being present in the scene for which their root 4018 // child agents from being present in the scene for which their root
4019 // agent isn't allowed. Otherwise, we allow child agents. The test for 4019 // agent isn't allowed. Otherwise, we allow child agents. The test for
4020 // the root is done elsewhere (QueryAccess) 4020 // the root is done elsewhere (QueryAccess)
4021 if (!SeeIntoRegion) 4021 if (!bypassAccessControl)
4022 { 4022 {
4023 List<UUID> agentGroups = new List<UUID>(); 4023 List<UUID> agentGroups = new List<UUID>();
4024 4024
@@ -5588,7 +5588,7 @@ namespace OpenSim.Region.Framework.Scenes
5588 5588
5589 try 5589 try
5590 { 5590 {
5591 if (!AuthorizeUser(aCircuit, out reason)) 5591 if (!AuthorizeUser(aCircuit, false, out reason))
5592 { 5592 {
5593 // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); 5593 // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
5594 return false; 5594 return false;