aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2013-05-14 08:49:41 -0700
committerRobert Adams2013-05-14 08:49:41 -0700
commit03fddb301b6b5a77f129bb0314176d89b78fd931 (patch)
tree62d6cc5302c87cb8b59932a5933a2673cee53001
parentBulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you... (diff)
parentRevert "HGTP-mesh bug: the mesh download requests were going to the departing... (diff)
downloadopensim-SC_OLD-03fddb301b6b5a77f129bb0314176d89b78fd931.zip
opensim-SC_OLD-03fddb301b6b5a77f129bb0314176d89b78fd931.tar.gz
opensim-SC_OLD-03fddb301b6b5a77f129bb0314176d89b78fd931.tar.bz2
opensim-SC_OLD-03fddb301b6b5a77f129bb0314176d89b78fd931.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
2 files changed, 3 insertions, 3 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 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index be78bd0..215a689 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1348,8 +1348,6 @@ namespace OpenSim.Region.Framework.Scenes
1348 // Create child agents in neighbouring regions 1348 // Create child agents in neighbouring regions
1349 if (openChildAgents && !IsChildAgent) 1349 if (openChildAgents && !IsChildAgent)
1350 { 1350 {
1351 SendInitialDataToMe();
1352
1353 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); 1351 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
1354 if (m_agentTransfer != null) 1352 if (m_agentTransfer != null)
1355 Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); }); 1353 Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
@@ -1357,7 +1355,6 @@ namespace OpenSim.Region.Framework.Scenes
1357 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); 1355 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
1358 if (friendsModule != null) 1356 if (friendsModule != null)
1359 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 1357 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
1360
1361 } 1358 }
1362 1359
1363 // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region 1360 // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region