From c163276032cb2328935fe94ff7e1c894768965a5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 22 Jul 2013 14:35:14 -0700 Subject: [PATCH] This commit message intentionally left blank (last commit was idiotic) --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index be6f65dc7c..80d1ac33f0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1331,7 +1331,8 @@ namespace OpenSim.Region.Framework.Scenes "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}", client.Name, Scene.RegionInfo.RegionName, AbsolutePosition); - if ((m_teleportFlags & TeleportFlags.ViaLogin) != 0) + // Make sure it's not a login agent. We don't want to wait for updates during login + if ((m_teleportFlags & TeleportFlags.ViaLogin) == 0) // Let's wait until UpdateAgent (called by departing region) is done if (!WaitForUpdateAgent(client)) // The sending region never sent the UpdateAgent data, we have to refuse