From 9602227eb6d26cf76d8c88ac86558218ca11e918 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 31 Dec 2009 06:19:22 +0100
Subject: Add a small delay in NewAgentConnection to fix an issue with Hippo
 (and possibly other cleints) getting their data mixed up.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region')

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
 
             CapsModule.AddCapsHandler(agent.AgentID);
 
+            if ((teleportFlags & ((uint)TeleportFlags.ViaLandmark | (uint)TeleportFlags.ViaLocation | (uint)TeleportFlags.ViaLandmark | (uint)TeleportFlags.Default)) != 0)
+                System.Threading.Thread.Sleep(2000);
+
             if (!agent.child)
             {
                 if (TestBorderCross(agent.startpos,Cardinals.E))
-- 
cgit v1.1