diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0237021..0dae946 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2890,9 +2890,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2890 | { | 2890 | { |
2891 | EventManager.TriggerOnClientLogin(client); | 2891 | EventManager.TriggerOnClientLogin(client); |
2892 | // Send initial parcel data | 2892 | // Send initial parcel data |
2893 | /* this is done on TriggerOnNewClient by landmanegement respective event handler | ||
2893 | Vector3 pos = sp.AbsolutePosition; | 2894 | Vector3 pos = sp.AbsolutePosition; |
2894 | ILandObject land = LandChannel.GetLandObject(pos.X, pos.Y); | 2895 | ILandObject land = LandChannel.GetLandObject(pos.X, pos.Y); |
2895 | land.SendLandUpdateToClient(client); | 2896 | land.SendLandUpdateToClient(client); |
2897 | */ | ||
2896 | } | 2898 | } |
2897 | 2899 | ||
2898 | return sp; | 2900 | return sp; |
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( |