diff options
author | Justin Clark-Casey (justincc) | 2013-07-26 18:43:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-26 18:43:15 +0100 |
commit | a08f01fa8323e18a63e920158c7f51ae78ac0e93 (patch) | |
tree | 4e299c4bb51ba800491564c405c796739397511d /OpenSim/Region/Framework | |
parent | Comment debug message (diff) | |
download | opensim-SC-a08f01fa8323e18a63e920158c7f51ae78ac0e93.zip opensim-SC-a08f01fa8323e18a63e920158c7f51ae78ac0e93.tar.gz opensim-SC-a08f01fa8323e18a63e920158c7f51ae78ac0e93.tar.bz2 opensim-SC-a08f01fa8323e18a63e920158c7f51ae78ac0e93.tar.xz |
Fix NPC regression test failures.
These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come.
Instead, we do not wait if the agent is an NPC.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4044f0c..17da0d9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1357,11 +1357,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1357 | client.Name, Scene.RegionInfo.RegionName, AbsolutePosition); | 1357 | client.Name, Scene.RegionInfo.RegionName, AbsolutePosition); |
1358 | 1358 | ||
1359 | // Make sure it's not a login agent. We don't want to wait for updates during login | 1359 | // Make sure it's not a login agent. We don't want to wait for updates during login |
1360 | if ((m_teleportFlags & TeleportFlags.ViaLogin) == 0) | 1360 | if (PresenceType != PresenceType.Npc && (m_teleportFlags & TeleportFlags.ViaLogin) == 0) |
1361 | { | ||
1361 | // Let's wait until UpdateAgent (called by departing region) is done | 1362 | // Let's wait until UpdateAgent (called by departing region) is done |
1362 | if (!WaitForUpdateAgent(client)) | 1363 | if (!WaitForUpdateAgent(client)) |
1363 | // The sending region never sent the UpdateAgent data, we have to refuse | 1364 | // The sending region never sent the UpdateAgent data, we have to refuse |
1364 | return; | 1365 | return; |
1366 | } | ||
1365 | 1367 | ||
1366 | Vector3 look = Velocity; | 1368 | Vector3 look = Velocity; |
1367 | 1369 | ||