diff options
| author | Tom Grimshaw | 2010-05-18 03:24:43 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-05-18 03:24:43 -0700 |
| commit | 1c040d8c1ed5ee1ba1e80aa1d248a9b06d1790a5 (patch) | |
| tree | c85d36357a2ae9f7a81d8e81b23039b5bdf06d08 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | Missed a nullref in the previous commit (diff) | |
| download | opensim-SC_OLD-1c040d8c1ed5ee1ba1e80aa1d248a9b06d1790a5.zip opensim-SC_OLD-1c040d8c1ed5ee1ba1e80aa1d248a9b06d1790a5.tar.gz opensim-SC_OLD-1c040d8c1ed5ee1ba1e80aa1d248a9b06d1790a5.tar.bz2 opensim-SC_OLD-1c040d8c1ed5ee1ba1e80aa1d248a9b06d1790a5.tar.xz | |
Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 9d0e6f4..6309cd9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -281,7 +281,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 281 | uint x = 0, y = 0; | 281 | uint x = 0, y = 0; |
| 282 | Utils.LongToUInts(regionHandle, out x, out y); | 282 | Utils.LongToUInts(regionHandle, out x, out y); |
| 283 | GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); | 283 | GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); |
| 284 | m_scene.SimulationService.CloseAgent(destination, agentID); | 284 | m_scene.SimulationService.CloseChildAgent(destination, agentID); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | private void SendCloseChildAgentCompleted(IAsyncResult iar) | 287 | private void SendCloseChildAgentCompleted(IAsyncResult iar) |