diff options
| author | Diva Canto | 2013-07-22 14:35:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-24 14:28:55 -0700 |
| commit | 879cbb45753bf3f3144512748acd8faf120fc626 (patch) | |
| tree | 26750fbf5bc3d81b89df80574e86a471750703d0 /OpenSim/Region/Framework/Scenes | |
| parent | Improve the opening test in CompleteMovement, to account for multiple flags b... (diff) | |
| download | opensim-SC_OLD-879cbb45753bf3f3144512748acd8faf120fc626.zip opensim-SC_OLD-879cbb45753bf3f3144512748acd8faf120fc626.tar.gz opensim-SC_OLD-879cbb45753bf3f3144512748acd8faf120fc626.tar.bz2 opensim-SC_OLD-879cbb45753bf3f3144512748acd8faf120fc626.tar.xz | |
This commit message intentionally left blank (last commit was idiotic)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
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 |