OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

varregion: restore checkAgentAccessToRegion routine in EntityTransferModule.

avinationmerge
Robert Adams 2015-03-27 06:47:55 -07:00
parent 9f18e3ba80
commit d74d74c910
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -150,13 +150,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
// Add this agent in this region as a banned person // Add this agent in this region as a banned person
public void Add(ulong pRegionHandle, UUID pAgentID) public void Add(ulong pRegionHandle, UUID pAgentID)
{
this.Add(pRegionHandle, pAgentID, 45, 15);
}
public void Add(ulong pRegionHandle, UUID pAgentID, double newTime, double extendTime)
{ {
if (!m_bannedRegions.TryGetValue(pAgentID, out m_idCache)) if (!m_bannedRegions.TryGetValue(pAgentID, out m_idCache))
{ {
m_idCache = new ExpiringCache<ulong, DateTime>(); m_idCache = new ExpiringCache<ulong, DateTime>();
m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(45)); m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(newTime));
} }
m_idCache.Add(pRegionHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15)); m_idCache.Add(pRegionHandle, DateTime.Now + TimeSpan.FromSeconds(extendTime), TimeSpan.FromSeconds(extendTime));
} }
// Remove the agent from the region's banned list // Remove the agent from the region's banned list
public void Remove(ulong pRegionHandle, UUID pAgentID) public void Remove(ulong pRegionHandle, UUID pAgentID)
@ -1447,6 +1451,31 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
#region Agent Crossings #region Agent Crossings
public bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, out string version, out string reason)
{
reason = String.Empty;
version = String.Empty;
UUID agentID = agent.UUID;
ulong destinyHandle = destiny.RegionHandle;
if (m_bannedRegionCache.IfBanned(destinyHandle, agentID))
{
reason = "Cannot connect to region";
return false;
}
Scene ascene = agent.Scene;
if (!ascene.SimulationService.QueryAccess(destiny, agentID, position, out version, out reason))
{
m_bannedRegionCache.Add(destinyHandle, agentID, 30.0, 30.0);
return false;
}
return true;
}
public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos) public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos)
{ {
string r = String.Empty; string r = String.Empty;