diff options
| author | Justin Clark-Casey (justincc) | 2013-05-14 19:45:35 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-05-14 19:45:35 +0100 |
| commit | ce979552fd53e50e939e1f09cd00e75440e458bb (patch) | |
| tree | f218cfec9c21515439ca0d8a639d1801378aa4e2 /OpenSim/Region/Framework | |
| parent | Comment out some debugging item permission messages since these are highly no... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-ce979552fd53e50e939e1f09cd00e75440e458bb.zip opensim-SC-ce979552fd53e50e939e1f09cd00e75440e458bb.tar.gz opensim-SC-ce979552fd53e50e939e1f09cd00e75440e458bb.tar.bz2 opensim-SC-ce979552fd53e50e939e1f09cd00e75440e458bb.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 215a689..2a265db 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1348,6 +1348,7 @@ 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(); | ||
| 1351 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | 1352 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
| 1352 | if (m_agentTransfer != null) | 1353 | if (m_agentTransfer != null) |
| 1353 | Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); }); | 1354 | Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); }); |