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/Framework/Scenes | |
| 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_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
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
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 |