Merge branch 'master' into httptests

2018-03-27 16:08:34 +01:00 · 2018-03-27 16:08:34 +01:00 · 20d221a963
parent e733bfb3b5 cb134e5487
commit 20d221a963
1 changed files with 0 additions and 1 deletions
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@ -1178,7 +1178,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;

            agent.SenderWantsToWaitForRoot = true;
-
            //SetCallbackURL(agent, sp.Scene.RegionInfo);

            // Reset the do not close flag.  This must be done before the destination opens child connections (here