diff options
| author | Melanie | 2011-11-17 19:04:27 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-17 19:04:27 +0000 |
| commit | 31736b1aac0387e51fe37ea9bab2e2e8c86988b6 (patch) | |
| tree | 14fbdc5f9b677185db1fe8080dafe28796c09336 /OpenSim/Framework/Servers/HttpServer | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow... (diff) | |
| download | opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.zip opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.gz opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.bz2 opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index 16e56d2..5e171f0 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
| @@ -69,6 +69,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 69 | while (m_running) | 69 | while (m_running) |
| 70 | { | 70 | { |
| 71 | PollServiceHttpRequest req = m_request.Dequeue(); | 71 | PollServiceHttpRequest req = m_request.Dequeue(); |
| 72 | |||
| 73 | Watchdog.UpdateThread(); | ||
| 74 | |||
| 72 | try | 75 | try |
| 73 | { | 76 | { |
| 74 | if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id)) | 77 | if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id)) |