aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index edd49eb..7f24174 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1350,7 +1350,8 @@ namespace OpenSim.Region.Framework.Scenes
1350 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}", 1350 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
1351 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition); 1351 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
1352 1352
1353 if ((m_teleportFlags & TeleportFlags.ViaLogin) != 0) 1353 // Make sure it's not a login agent. We don't want to wait for updates during login
1354 if ((m_teleportFlags & TeleportFlags.ViaLogin) == 0)
1354 // Let's wait until UpdateAgent (called by departing region) is done 1355 // Let's wait until UpdateAgent (called by departing region) is done
1355 if (!WaitForUpdateAgent(client)) 1356 if (!WaitForUpdateAgent(client))
1356 // The sending region never sent the UpdateAgent data, we have to refuse 1357 // The sending region never sent the UpdateAgent data, we have to refuse