aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-08-15 21:46:28 +0100
committerJustin Clark-Casey (justincc)2014-08-15 21:47:34 +0100
commite0c6bfa81e842f4ba1534882c6d76a3e6e94d68b (patch)
tree6826fc7df72508e3cc02a1d3795ab4065de65cf0 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
parentOn teleport to a region that already has a child agent established (e.g. a ne... (diff)
downloadopensim-SC-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.zip
opensim-SC-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.tar.gz
opensim-SC-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.tar.bz2
opensim-SC-e0c6bfa81e842f4ba1534882c6d76a3e6e94d68b.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
1 files changed, 1 insertions, 1 deletions
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
1740 AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code); 1740 AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
1741 bool tp = (aCircuit.teleportFlags > 0); 1741 bool tp = (aCircuit.teleportFlags > 0);
1742 // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from 1742 // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
1743 if (!tp) 1743 if (!tp && !client.SceneAgent.SentInitialDataToClient)
1744 client.SceneAgent.SendInitialDataToClient(); 1744 client.SceneAgent.SendInitialDataToClient();
1745 } 1745 }
1746 } 1746 }