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