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

Stop simulators attempting to contact registered but offline regions (RegionFlags.Persistent but not RegioNFlags.RegionOnline) on startup and when an avatar completes a teleport.

Browse Source 
This eliminates spurious network calls and failure reporting.
This is done by adding RegionFlags to the GridRegion returned data in a backward compatible way as an alternative to multiple IGridService.GetRegionFlags() calls
Using a simulator or a grid service older than this commit will just see previous behaviour.
This commit is contained in:
Justin Clark-Casey (justincc)
2015-01-14 19:40:17 +00:00
parent 72814245be
commit beef41f24c
3 changed files with 168 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,9 +109,34 @@ namespace OpenSim.Region.Framework.Scenes
List<GridRegion> neighbours
= m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
m_log.DebugFormat("{0} Informing {1} neighbours that region {2} is up", LogHeader, neighbours.Count, m_scene.Name);
List<GridRegion> onlineNeighbours = new List<GridRegion>();
foreach (GridRegion n in neighbours)
{
OpenSim.Framework.RegionFlags? regionFlags = n.RegionFlags;
// m_log.DebugFormat(
// "{0}: Region flags for {1} as seen by {2} are {3}",
// LogHeader, n.RegionName, m_scene.Name, regionFlags != null ? regionFlags.ToString() : "not present");
// Robust services before 2015-01-14 do not return the regionFlags information. In this case, we could
// make a separate RegionFlags call but this would involve a network call for each neighbour.
if (regionFlags != null)
{
if ((regionFlags & OpenSim.Framework.RegionFlags.RegionOnline) != 0)
onlineNeighbours.Add(n);
}
else
{
onlineNeighbours.Add(n);
}
}
m_log.DebugFormat(
"{0} Informing {1} neighbours that region {2} is up",
LogHeader, onlineNeighbours.Count, m_scene.Name);
foreach (GridRegion n in onlineNeighbours)
{
InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
d.BeginInvoke(neighbourService, region, n.RegionHandle,