diff options
| author | Justin Clark-Casey (justincc) | 2012-02-24 05:25:18 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-24 05:25:18 +0000 |
| commit | bafef292f4d41df14a1edeafc7ba5f9d623d7822 (patch) | |
| tree | fafe03e1890e915c0d8d7375dc4188f434fb37db /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ... (diff) | |
| download | opensim-SC-bafef292f4d41df14a1edeafc7ba5f9d623d7822.zip opensim-SC-bafef292f4d41df14a1edeafc7ba5f9d623d7822.tar.gz opensim-SC-bafef292f4d41df14a1edeafc7ba5f9d623d7822.tar.bz2 opensim-SC-bafef292f4d41df14a1edeafc7ba5f9d623d7822.tar.xz | |
Take watchdog alarm calling back outside the m_threads lock.
This is how it was originally. This stops a very long running alarm callback from causing a problem.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 19c9745..4d98f00 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -156,8 +156,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 156 | // that the region position is cached or performance will degrade | 156 | // that the region position is cached or performance will degrade |
| 157 | Utils.LongToUInts(regionHandle, out x, out y); | 157 | Utils.LongToUInts(regionHandle, out x, out y); |
| 158 | GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); | 158 | GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); |
| 159 | bool v = true; | 159 | // bool v = true; |
| 160 | if (! simulatorList.Contains(dest.ServerURI)) | 160 | if (!simulatorList.Contains(dest.ServerURI)) |
| 161 | { | 161 | { |
| 162 | // we havent seen this simulator before, add it to the list | 162 | // we havent seen this simulator before, add it to the list |
| 163 | // and send it an update | 163 | // and send it an update |