diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c8c8714..df7a72a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -219,8 +219,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
219 | } | 219 | } |
220 | } | 220 | } |
221 | 221 | ||
222 | public delegate void SendCloseChildAgentDelegate(UUID agentID, ulong regionHandle); | ||
223 | |||
222 | /// <summary> | 224 | /// <summary> |
223 | /// Closes a child agent on a given region | 225 | /// This Closes child agents on neighboring regions |
226 | /// Calls an asynchronous method to do so.. so it doesn't lag the sim. | ||
224 | /// </summary> | 227 | /// </summary> |
225 | protected void SendCloseChildAgent(UUID agentID, ulong regionHandle, string auth_token) | 228 | protected void SendCloseChildAgent(UUID agentID, ulong regionHandle, string auth_token) |
226 | { | 229 | { |
@@ -248,7 +251,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
248 | { | 251 | { |
249 | foreach (ulong handle in regionslst) | 252 | foreach (ulong handle in regionslst) |
250 | { | 253 | { |
251 | // We must take a copy here since handle is acts like a reference when used in an iterator. | 254 | // We must take a copy here since handle acts like a reference when used in an iterator. |
252 | // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region. | 255 | // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region. |
253 | ulong handleCopy = handle; | 256 | ulong handleCopy = handle; |
254 | Util.FireAndForget( | 257 | Util.FireAndForget( |
@@ -257,10 +260,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
257 | "SceneCommunicationService.SendCloseChildAgentConnections"); | 260 | "SceneCommunicationService.SendCloseChildAgentConnections"); |
258 | } | 261 | } |
259 | } | 262 | } |
260 | 263 | ||
261 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) | 264 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) |
262 | { | 265 | { |
263 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); | 266 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); |
264 | } | 267 | } |
265 | } | 268 | } |
266 | } \ No newline at end of file | 269 | } |