aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2012-02-20 19:48:28 +0000
committerMelanie2012-02-20 19:48:28 +0000
commit3b2900e88415e3dc7826df3e8685415134676dcc (patch)
treec66bb6827a6d1b03be2561bd476249bbd1cf50f3 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentAmend to last commit: synchronize access to queues. (diff)
downloadopensim-SC_OLD-3b2900e88415e3dc7826df3e8685415134676dcc.zip
opensim-SC_OLD-3b2900e88415e3dc7826df3e8685415134676dcc.tar.gz
opensim-SC_OLD-3b2900e88415e3dc7826df3e8685415134676dcc.tar.bz2
opensim-SC_OLD-3b2900e88415e3dc7826df3e8685415134676dcc.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b38523f..283de39 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1255,7 +1255,7 @@ namespace OpenSim.Region.Framework.Scenes
1255 { 1255 {
1256 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); 1256 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
1257 if (m_agentTransfer != null) 1257 if (m_agentTransfer != null)
1258 m_agentTransfer.EnableChildAgents(this); 1258 Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
1259 1259
1260 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); 1260 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
1261 if (friendsModule != null) 1261 if (friendsModule != null)