From b69ddbb66b562aaf634d9a59558fabd9245bd9c0 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 21 Jul 2013 16:18:24 -0700 Subject: [PATCH] That didn't work. If anything, it made it worse. Revert "EXPERIMENTAL: Switch MoveAgentIntoRegion with MakeRootAgent, to see if that eliminates the momentary position at infinity." This reverts commit 1cb5e317164b2d3e761e19bce3f6b86f3be6e602. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b750bee24b..a3d328fadb 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1328,9 +1328,8 @@ namespace OpenSim.Region.Framework.Scenes } bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); - ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); MakeRootAgent(AbsolutePosition, flying); - + ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); // Remember in HandleUseCircuitCode, we delayed this to here // This will also send the initial data to clients when TP to a neighboring region. // Not ideal, but until we know we're TP-ing from a neighboring region, there's not much we can do