aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2013-05-14 08:47:18 -0700
committerDiva Canto2013-05-14 08:47:18 -0700
commit645da54f25bb034eb76151daa9723763eae13303 (patch)
tree58c200f5b70c22faaf4904164780a24b3e1708c4 /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-645da54f25bb034eb76151daa9723763eae13303.zip
opensim-SC_OLD-645da54f25bb034eb76151daa9723763eae13303.tar.gz
opensim-SC_OLD-645da54f25bb034eb76151daa9723763eae13303.tar.bz2
opensim-SC_OLD-645da54f25bb034eb76151daa9723763eae13303.tar.xz
Revert "HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!"
This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 0 insertions, 3 deletions
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