diff options
author | UbitUmarov | 2012-09-07 09:40:28 +0100 |
---|---|---|
committer | UbitUmarov | 2012-09-07 09:40:28 +0100 |
commit | 23be1cf1cd0722d48e7e15d2e2bb4e85eef1016e (patch) | |
tree | d80b7cb805b0a6fe1d4fd1ce0a003a305ce4133b /OpenSim/Region/Framework | |
parent | Prevent double slashes, try #4 (diff) | |
download | opensim-SC_OLD-23be1cf1cd0722d48e7e15d2e2bb4e85eef1016e.zip opensim-SC_OLD-23be1cf1cd0722d48e7e15d2e2bb4e85eef1016e.tar.gz opensim-SC_OLD-23be1cf1cd0722d48e7e15d2e2bb4e85eef1016e.tar.bz2 opensim-SC_OLD-23be1cf1cd0722d48e7e15d2e2bb4e85eef1016e.tar.xz |
remove fireandforget call to EnableChildAgents at end on CompleteMovement,
since this is already on own thread and its at the end of it.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 433efc7..a8aa551 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1315,13 +1315,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
1315 | // Create child agents in neighbouring regions | 1315 | // Create child agents in neighbouring regions |
1316 | if (openChildAgents && !IsChildAgent) | 1316 | if (openChildAgents && !IsChildAgent) |
1317 | { | 1317 | { |
1318 | |||
1318 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | 1319 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
1319 | if (m_agentTransfer != null) | 1320 | if (m_agentTransfer != null) |
1320 | Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); }); | 1321 | m_agentTransfer.EnableChildAgents(this); |
1321 | 1322 | ||
1322 | IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); | 1323 | IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); |
1323 | if (friendsModule != null) | 1324 | if (friendsModule != null) |
1324 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1325 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
1326 | |||
1325 | } | 1327 | } |
1326 | 1328 | ||
1327 | // m_log.DebugFormat( | 1329 | // m_log.DebugFormat( |