diff options
| author | Teravus Ovares | 2008-10-05 18:42:05 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-10-05 18:42:05 +0000 |
| commit | 3ac76db76b378525c001027596df9edbf4ed021e (patch) | |
| tree | 473af36bc311922b784c1434ab89f97f9412394c /OpenSim/Region | |
| parent | Revert the packet resend timing changes. They caused login issues in primmy (diff) | |
| download | opensim-SC-3ac76db76b378525c001027596df9edbf4ed021e.zip opensim-SC-3ac76db76b378525c001027596df9edbf4ed021e.tar.gz opensim-SC-3ac76db76b378525c001027596df9edbf4ed021e.tar.bz2 opensim-SC-3ac76db76b378525c001027596df9edbf4ed021e.tar.xz | |
* Fixes the last snag with the EventQueue. The situation where the seedcap gets lost on teleport.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index b342cb6..162e1c6 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
| @@ -682,10 +682,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 682 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail | 682 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail |
| 683 | // once we reach here... | 683 | // once we reach here... |
| 684 | avatar.Scene.RemoveCapsHandler(avatar.UUID); | 684 | avatar.Scene.RemoveCapsHandler(avatar.UUID); |
| 685 | 685 | agent.child = false; | |
| 686 | m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); | 686 | m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent); |
| 687 | |||
| 687 | m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, | 688 | m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, |
| 688 | position, false); | 689 | position, false); |
| 690 | Thread.Sleep(4000); | ||
| 689 | AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); | 691 | AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); |
| 690 | 692 | ||
| 691 | // TODO Should construct this behind a method | 693 | // TODO Should construct this behind a method |