diff options
| author | Robert Adams | 2013-05-14 08:49:41 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-14 08:49:41 -0700 |
| commit | 03fddb301b6b5a77f129bb0314176d89b78fd931 (patch) | |
| tree | 62d6cc5302c87cb8b59932a5933a2673cee53001 /OpenSim/Region/ClientStack/Linden | |
| parent | BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you... (diff) | |
| parent | Revert "HGTP-mesh bug: the mesh download requests were going to the departing... (diff) | |
| download | opensim-SC-03fddb301b6b5a77f129bb0314176d89b78fd931.zip opensim-SC-03fddb301b6b5a77f129bb0314176d89b78fd931.tar.gz opensim-SC-03fddb301b6b5a77f129bb0314176d89b78fd931.tar.bz2 opensim-SC-03fddb301b6b5a77f129bb0314176d89b78fd931.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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 | |||
| 1371 | // circuit code to the existing child agent. This is not particularly obvious. | 1371 | // circuit code to the existing child agent. This is not particularly obvious. |
| 1372 | SendAckImmediate(endPoint, uccp.Header.Sequence); | 1372 | SendAckImmediate(endPoint, uccp.Header.Sequence); |
| 1373 | 1373 | ||
| 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) | ||
| 1376 | client.SceneAgent.SendInitialDataToMe(); | ||
| 1374 | } | 1377 | } |
| 1375 | else | 1378 | else |
| 1376 | { | 1379 | { |