diff options
| author | Melanie | 2009-12-31 06:19:22 +0100 |
|---|---|---|
| committer | Melanie | 2009-12-31 06:20:35 +0100 |
| commit | 9602227eb6d26cf76d8c88ac86558218ca11e918 (patch) | |
| tree | cd4ffbf8cee5f1a4b8deb2b33237860d26fad187 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC-9602227eb6d26cf76d8c88ac86558218ca11e918.zip opensim-SC-9602227eb6d26cf76d8c88ac86558218ca11e918.tar.gz opensim-SC-9602227eb6d26cf76d8c88ac86558218ca11e918.tar.bz2 opensim-SC-9602227eb6d26cf76d8c88ac86558218ca11e918.tar.xz | |
Add a small delay in NewAgentConnection to fix an issue with Hippo
(and possibly other cleints) getting their data mixed up.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2091bf0..2e34d1c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3414,6 +3414,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3414 | 3414 | ||
| 3415 | CapsModule.AddCapsHandler(agent.AgentID); | 3415 | CapsModule.AddCapsHandler(agent.AgentID); |
| 3416 | 3416 | ||
| 3417 | if ((teleportFlags & ((uint)TeleportFlags.ViaLandmark | (uint)TeleportFlags.ViaLocation | (uint)TeleportFlags.ViaLandmark | (uint)TeleportFlags.Default)) != 0) | ||
| 3418 | System.Threading.Thread.Sleep(2000); | ||
| 3419 | |||
| 3417 | if (!agent.child) | 3420 | if (!agent.child) |
| 3418 | { | 3421 | { |
| 3419 | if (TestBorderCross(agent.startpos,Cardinals.E)) | 3422 | if (TestBorderCross(agent.startpos,Cardinals.E)) |