Removing the region where the agent is in from the list of regions to close child agents.

0.6.2-post-fixes
diva 2008-12-22 06:56:47 +00:00
parent 9056ad63d5
commit 69fe246fcc
1 changed files with 6 additions and 3 deletions

View File

@ -2558,7 +2558,9 @@ namespace OpenSim.Region.Environment.Scenes
//{ //{
// childknownRegions.Add(ckn[i]); // childknownRegions.Add(ckn[i]);
//} //}
m_sceneGridService.SendCloseChildAgentConnections(agentID, avatar.KnownChildRegionHandles); List<ulong> regions = new List<ulong>(avatar.KnownChildRegionHandles);
regions.Remove(RegionInfo.RegionHandle);
m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
} }
m_eventManager.TriggerClientClosed(agentID); m_eventManager.TriggerClientClosed(agentID);
@ -2725,11 +2727,12 @@ namespace OpenSim.Region.Environment.Scenes
{ {
m_log.DebugFormat("[CONNECTION DEBUGGING]: Updated agent {0} in {1}", agent.AgentID, RegionInfo.RegionName); m_log.DebugFormat("[CONNECTION DEBUGGING]: Updated agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
sp.AdjustKnownSeeds(); sp.AdjustKnownSeeds();
sp.AbsolutePosition = agent.startpos;
return; return;
} }
m_log.DebugFormat("[CONNECTION DEBUGGING]: Adding NewUserConnection for {0} in {1} with CC of {2}", agent.AgentID, m_log.DebugFormat("[CONNECTION DEBUGGING]: Adding NewUserConnection for {0} in {1} with CC of {2}, pos={3}", agent.AgentID,
RegionInfo.RegionName, agent.circuitcode); RegionInfo.RegionName, agent.circuitcode, agent.startpos.ToString());
AddCapsHandler(agent.AgentID); AddCapsHandler(agent.AgentID);