Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 2 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e1a8941..ab7fd5b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1348,7 +1348,9 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
+                // Remember in HandleUseCircuitCode, we delayed this to here
                 SendInitialDataToMe();
+
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });