From 261512606d77747701934e80e150bd55454571f2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 14:23:50 -0700
Subject: Improve the opening test in CompleteMovement, to account for multiple
 flags besides ViaLogin.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

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
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
                 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
 
-            if (m_teleportFlags != TeleportFlags.ViaLogin)
+            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
-- 
cgit v1.1