From 964ec57ffe5ce2e9feac4295ade9cc4a5a223d69 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 16 Dec 2011 17:24:50 -0800
Subject: Changed the async approach on close child agents. This may improve
crossings a little bit.
---
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 9 +++------
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 ++++-
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index d76ed3e..58a7b20 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -204,13 +204,10 @@ namespace OpenSim.Region.Framework.Scenes
///
public void SendCloseChildAgentConnections(UUID agentID, List regionslst)
{
- Util.FireAndForget(delegate
+ foreach (ulong handle in regionslst)
{
- foreach (ulong handle in regionslst)
- {
- SendCloseChildAgent(agentID, handle);
- }
- });
+ SendCloseChildAgent(agentID, handle);
+ }
}
public List RequestNamedRegions(string name, int maxNumber)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 800b7e0..b16eaba 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2955,7 +2955,10 @@ namespace OpenSim.Region.Framework.Scenes
if (byebyeRegions.Count > 0)
{
m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents");
- m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions);
+ Util.FireAndForget(delegate
+ {
+ m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions);
+ });
}
foreach (ulong handle in byebyeRegions)
--
cgit v1.1