diff options
author | Diva Canto | 2013-05-14 09:06:58 -0700 |
---|---|---|
committer | Diva Canto | 2013-05-14 09:06:58 -0700 |
commit | 91091c3e5453088242e05a682283fc7f9f5c7ae3 (patch) | |
tree | 086dbe3f4f14fd4befd3bbc51bfe809f9a17cabf /OpenSim/Region/ClientStack | |
parent | Revert "HGTP-mesh bug: the mesh download requests were going to the departing... (diff) | |
download | opensim-SC_OLD-91091c3e5453088242e05a682283fc7f9f5c7ae3.zip opensim-SC_OLD-91091c3e5453088242e05a682283fc7f9f5c7ae3.tar.gz opensim-SC_OLD-91091c3e5453088242e05a682283fc7f9f5c7ae3.tar.bz2 opensim-SC_OLD-91091c3e5453088242e05a682283fc7f9f5c7ae3.tar.xz |
Second take at HGTP-mesh bug: delay sending the initial data only for agents that are coming via TP (root agents)
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 985aa4d..8eb2e06 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1373,7 +1373,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1373 | 1373 | ||
1374 | // We only want to send initial data to new clients, not ones which are being converted from child to root. | 1374 | // We only want to send initial data to new clients, not ones which are being converted from child to root. |
1375 | if (client != null) | 1375 | if (client != null) |
1376 | client.SceneAgent.SendInitialDataToMe(); | 1376 | { |
1377 | AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code); | ||
1378 | bool tp = (aCircuit.teleportFlags > 0); | ||
1379 | // Let's delay this for TP agents, otherwise the viewer doesn't know where to get meshes from | ||
1380 | if (!tp) | ||
1381 | client.SceneAgent.SendInitialDataToMe(); | ||
1382 | } | ||
1377 | } | 1383 | } |
1378 | else | 1384 | else |
1379 | { | 1385 | { |