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

On TP, child-agents weren't closed down properly, as the list of child-regions 

was cleared before using it to find the children.
0.6.0-stable
Homer Horwitz 2008-11-03 19:56:47 +00:00
parent a64d6eccd0
commit 580b11779a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -672,6 +672,9 @@ namespace OpenSim.Region.Environment.Scenes
return;
}
// the avatar.Close below will clear the child region list. We need this below for (possibly)
// closing the child agents, so save it here (we need a copy as it is Clear()-ed).
List<ulong> childRegions = new List<ulong>(avatar.GetKnownRegionList());
avatar.Close();
// Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport
@ -721,6 +724,7 @@ namespace OpenSim.Region.Environment.Scenes
if (Util.fast_distance2d((int)(newRegionX - oldRegionX), (int)(newRegionY - oldRegionY)) > 3)
{
SendCloseChildAgentConnections(avatar.UUID,avatar.GetKnownRegionList());
SendCloseChildAgentConnections(avatar.UUID, childRegions);
CloseConnection(m_regionInfo.RegionHandle, avatar.UUID);
}
// if (teleport success) // seems to be always success here