From 645da54f25bb034eb76151daa9723763eae13303 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 08:47:18 -0700
Subject: Revert "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!"

This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/ClientStack/Linden')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 0fa1c0e..985aa4d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1371,6 +1371,9 @@ 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
                 {
-- 
cgit v1.1