ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Amend previous commit.

Browse Source
This commit is contained in:
Diva Canto
2013-07-24 11:42:35 -07:00
parent 665fb66686
commit 00d4a26eef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3739,7 +3739,7 @@ namespace OpenSim.Region.Framework.Scenes
try
{
if (!AuthorizeUser(agent, out reason))
if (!AuthorizeUser(agent, SeeIntoRegion, out reason))
{
m_authenticateHandler.RemoveCircuit(agent.circuitcode);
return false;
@@ -3979,7 +3979,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="reason">outputs the reason to this string</param>
/// <returns>True if the region accepts this agent. False if it does not. False will
/// also return a reason.</returns>
protected virtual bool AuthorizeUser(AgentCircuitData agent, out string reason)
protected virtual bool AuthorizeUser(AgentCircuitData agent, bool bypassAccessControl, out string reason)
{
reason = String.Empty;
@@ -4018,7 +4018,7 @@ namespace OpenSim.Region.Framework.Scenes
// child agents from being present in the scene for which their root
// agent isn't allowed. Otherwise, we allow child agents. The test for
// the root is done elsewhere (QueryAccess)
if (!SeeIntoRegion)
if (!bypassAccessControl)
{
List<UUID> agentGroups = new List<UUID>();
@@ -5588,7 +5588,7 @@ namespace OpenSim.Region.Framework.Scenes
try
{
if (!AuthorizeUser(aCircuit, out reason))
if (!AuthorizeUser(aCircuit, false, out reason))
{
// m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
return false;