aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2008-12-22 06:56:47 +0000
committerdiva2008-12-22 06:56:47 +0000
commit69fe246fcc19ab75a905c037e169be03eb638d73 (patch)
tree24d6684099fbd4045aaff131d6b014d04662dea2 /OpenSim
parentOne more small mod in EQ: there is no need to subscribe to the OnLogout event... (diff)
downloadopensim-SC_OLD-69fe246fcc19ab75a905c037e169be03eb638d73.zip
opensim-SC_OLD-69fe246fcc19ab75a905c037e169be03eb638d73.tar.gz
opensim-SC_OLD-69fe246fcc19ab75a905c037e169be03eb638d73.tar.bz2
opensim-SC_OLD-69fe246fcc19ab75a905c037e169be03eb638d73.tar.xz
Removing the region where the agent is in from the list of regions to close child agents.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5bc416f..c359e4a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2558,7 +2558,9 @@ namespace OpenSim.Region.Environment.Scenes
2558 //{ 2558 //{
2559 // childknownRegions.Add(ckn[i]); 2559 // childknownRegions.Add(ckn[i]);
2560 //} 2560 //}
2561 m_sceneGridService.SendCloseChildAgentConnections(agentID, avatar.KnownChildRegionHandles); 2561 List<ulong> regions = new List<ulong>(avatar.KnownChildRegionHandles);
2562 regions.Remove(RegionInfo.RegionHandle);
2563 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
2562 2564
2563 } 2565 }
2564 m_eventManager.TriggerClientClosed(agentID); 2566 m_eventManager.TriggerClientClosed(agentID);
@@ -2725,11 +2727,12 @@ namespace OpenSim.Region.Environment.Scenes
2725 { 2727 {
2726 m_log.DebugFormat("[CONNECTION DEBUGGING]: Updated agent {0} in {1}", agent.AgentID, RegionInfo.RegionName); 2728 m_log.DebugFormat("[CONNECTION DEBUGGING]: Updated agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
2727 sp.AdjustKnownSeeds(); 2729 sp.AdjustKnownSeeds();
2730 sp.AbsolutePosition = agent.startpos;
2728 return; 2731 return;
2729 } 2732 }
2730 2733
2731 m_log.DebugFormat("[CONNECTION DEBUGGING]: Adding NewUserConnection for {0} in {1} with CC of {2}", agent.AgentID, 2734 m_log.DebugFormat("[CONNECTION DEBUGGING]: Adding NewUserConnection for {0} in {1} with CC of {2}, pos={3}", agent.AgentID,
2732 RegionInfo.RegionName, agent.circuitcode); 2735 RegionInfo.RegionName, agent.circuitcode, agent.startpos.ToString());
2733 2736
2734 AddCapsHandler(agent.AgentID); 2737 AddCapsHandler(agent.AgentID);
2735 2738