From e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Aug 2014 21:46:28 +0100
Subject: If a user moves back in sight of a child region before the agent has
 been closed on teleport, don't unnecessarily resend all avatar and object
 data about that region.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 0df22bf..708a0a1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1740,7 +1740,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
                         bool tp = (aCircuit.teleportFlags > 0);
                         // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
-                        if (!tp)
+                        if (!tp && !client.SceneAgent.SentInitialDataToClient)
                             client.SceneAgent.SendInitialDataToClient();
                     }
                 }
-- 
cgit v1.1