diff options
| author | Melanie | 2013-06-07 23:09:53 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-07 23:09:53 +0100 |
| commit | 45e333652c75bc3101ac7f757105b6f7ed5024a5 (patch) | |
| tree | e23ffd4f6ca0d20ef0501c683d9659c09c7c2d3e /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: add dr0berts to contributors list (diff) | |
| download | opensim-SC_OLD-45e333652c75bc3101ac7f757105b6f7ed5024a5.zip opensim-SC_OLD-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.gz opensim-SC_OLD-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.bz2 opensim-SC_OLD-45e333652c75bc3101ac7f757105b6f7ed5024a5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 775a4c2..df61dde 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -222,8 +222,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 222 | { | 222 | { |
| 223 | foreach (ulong handle in regionslst) | 223 | foreach (ulong handle in regionslst) |
| 224 | { | 224 | { |
| 225 | ulong handleCopy = handle; | ||
| 225 | SendCloseChildAgentDelegate d = SendCloseChildAgentAsync; | 226 | SendCloseChildAgentDelegate d = SendCloseChildAgentAsync; |
| 226 | d.BeginInvoke(agentID, handle, | 227 | d.BeginInvoke(agentID, handleCopy, |
| 227 | SendCloseChildAgentCompleted, | 228 | SendCloseChildAgentCompleted, |
| 228 | d); | 229 | d); |
| 229 | } | 230 | } |