From f32a21d96707f87ecbdaf42c0059f8494a119d31 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 08:12:01 -0700
Subject: HGTP-mesh bug: the mesh download requests were going to the departing
 sims for a little while. This was also true for local TPs. BUt for local TPs
 the assets are on the same server, so it doesn't matter. For HGTPs, it
 matters. This potential fix moves sending the initial data to later, after
 the client has completed the movement into the region. Fingers crossed that
 it doesn't mess other things up!

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 ---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 985aa4d..0fa1c0e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1371,9 +1371,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // circuit code to the existing child agent.  This is not particularly obvious.
                     SendAckImmediate(endPoint, uccp.Header.Sequence);
             
-                    // We only want to send initial data to new clients, not ones which are being converted from child to root.
-                    if (client != null)
-                        client.SceneAgent.SendInitialDataToMe();
                 }
                 else
                 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 215a689..be78bd0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1348,6 +1348,8 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
+                SendInitialDataToMe();
+
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
@@ -1355,6 +1357,7 @@ namespace OpenSim.Region.Framework.Scenes
                 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                 if (friendsModule != null)
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+
             }
 
             // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
-- 
cgit v1.1