ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix up QueryAccess to also check parcels

Browse Source
This commit is contained in:
Melanie
2011-01-28 03:07:25 +01:00
parent 566eff17de
commit 657c14c5db
7 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5141,23 +5141,38 @@ namespace OpenSim.Region.Framework.Scenes
// from logging into the region, teleporting into the region
// or corssing the broder walking, but will NOT prevent
// child agent creation, thereby emulating the SL behavior.
public bool QueryAccess(UUID agentID)
public bool QueryAccess(UUID agentID, Vector3 position)
{
string reason;
if (!AuthorizeUser(agentID, out reason))
{
m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
// m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
return false;
}
float posX = 128.0f;
float posY = 128.0f;
if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
if (position == Vector3.Zero) // Teleport
{
m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
return false;
float posX = 128.0f;
float posY = 128.0f;
if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
{
// m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
return false;
}
}
else // Walking
{
ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
if (land == null)
return false;
bool banned = land.IsBannedFromLand(agentID);
bool restricted = land.IsRestrictedFromLand(agentID);
if (banned || restricted)
return false;
}
return true;
}