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

* Shutting down child agents properly in neighbor regions.

Browse Source
This commit is contained in:
Teravus Ovares
2008-01-21 23:04:42 +00:00
parent 274d958893
commit 3fe6b2280d
9 changed files with 183 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -1288,6 +1288,7 @@ namespace OpenSim.Region.Environment.Scenes
CommsManager.LogOffUser(agentID, RegionInfo.RegionID, RegionInfo.RegionHandle,
avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y,
avatar.AbsolutePosition.Z);
m_sceneGridService.SendCloseChildAgentConnections(avatar);
}
}
catch (NullReferenceException)
@@ -1389,6 +1390,7 @@ namespace OpenSim.Region.Environment.Scenes
m_sceneGridService.OnCloseAgentConnection += CloseConnection;
m_sceneGridService.OnRegionUp += OtherRegionUp;
m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
m_sceneGridService.KillObject = SendKillObject;
@@ -1509,7 +1511,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="agentID"></param>
public void CloseConnection(ulong regionHandle, LLUUID agentID)
public bool CloseConnection(ulong regionHandle, LLUUID agentID)
{
if (regionHandle == m_regionHandle)
{
@@ -1527,8 +1529,10 @@ namespace OpenSim.Region.Environment.Scenes
// Tell a single agent to disconnect from the region.
libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket) PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator);
presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Task);
presence.ControllingClient.Close(true);
}
}
return true;
}
/// <summary>