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

minor: organizational 

* Move the neighbor region lookup to another method from where it was before in EnableNeighbourChildAgents.
remotes/origin/0.6.7-post-fixes
Teravus Ovares (Dan Olivares) 2009-09-06 21:26:59 -04:00
parent a6e2e94345
commit c4edefd9a0
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -407,6 +407,24 @@ namespace OpenSim.Region.Framework.Scenes
//blah.Port = region.RemotingPort; //blah.Port = region.RemotingPort;
} }
public List<SimpleRegionInfo> RequestNeighbors(Scene pScene, uint pRegionLocX, uint pRegionLocY)
{
Border[] northBorders = pScene.NorthBorders.ToArray();
Border[] southBorders = pScene.SouthBorders.ToArray();
Border[] eastBorders = pScene.EastBorders.ToArray();
Border[] westBorders = pScene.WestBorders.ToArray();
// Legacy one region. Provided for simplicity while testing the all inclusive method in the else statement.
if (northBorders.Length <= 1 && southBorders.Length <= 1 && eastBorders.Length <= 1 && westBorders.Length <= 1)
{
return m_commsProvider.GridService.RequestNeighbours(pRegionLocX, pRegionLocY);
}
else
{
return m_commsProvider.GridService.RequestNeighbours(pRegionLocX, pRegionLocY);
}
}
/// <summary> /// <summary>
/// This informs all neighboring regions about agent "avatar". /// This informs all neighboring regions about agent "avatar".
/// Calls an asynchronous method to do so.. so it doesn't lag the sim. /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
@ -429,7 +447,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_regionInfo != null) if (m_regionInfo != null)
{ {
neighbours = neighbours =
m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); RequestNeighbors(avatar.Scene,m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
} }
else else
{ {