diff options
| author | Diva Canto | 2013-07-22 14:23:50 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-24 14:28:41 -0700 |
| commit | 261512606d77747701934e80e150bd55454571f2 (patch) | |
| tree | 8e5234a89b8c98b05301349b2b1ef86d2920d6ed /OpenSim/Region | |
| parent | More on putting TP V1 as it was (diff) | |
| download | opensim-SC_OLD-261512606d77747701934e80e150bd55454571f2.zip opensim-SC_OLD-261512606d77747701934e80e150bd55454571f2.tar.gz opensim-SC_OLD-261512606d77747701934e80e150bd55454571f2.tar.bz2 opensim-SC_OLD-261512606d77747701934e80e150bd55454571f2.tar.xz | |
Improve the opening test in CompleteMovement, to account for multiple flags besides ViaLogin.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 891e04e..edd49eb 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1350,7 +1350,7 @@ 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) | 1353 | if ((m_teleportFlags & TeleportFlags.ViaLogin) != 0) |
| 1354 | // Let's wait until UpdateAgent (called by departing region) is done | 1354 | // Let's wait until UpdateAgent (called by departing region) is done |
| 1355 | if (!WaitForUpdateAgent(client)) | 1355 | if (!WaitForUpdateAgent(client)) |
| 1356 | // The sending region never sent the UpdateAgent data, we have to refuse | 1356 | // The sending region never sent the UpdateAgent data, we have to refuse |