aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer
diff options
context:
space:
mode:
authorUbitUmarov2012-09-26 04:52:19 +0100
committerUbitUmarov2012-09-26 04:52:19 +0100
commit67fa6577461bf1e2a39c501f73d8bfc9045ee69e (patch)
treee9f742c2eb77796ca91dcc727f565f99f36c6bb2 /OpenSim/Framework/Servers/HttpServer
parent more changes to PollService (diff)
downloadopensim-SC-67fa6577461bf1e2a39c501f73d8bfc9045ee69e.zip
opensim-SC-67fa6577461bf1e2a39c501f73d8bfc9045ee69e.tar.gz
opensim-SC-67fa6577461bf1e2a39c501f73d8bfc9045ee69e.tar.bz2
opensim-SC-67fa6577461bf1e2a39c501f73d8bfc9045ee69e.tar.xz
keep watchdog happy using it to kill his threads
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs10
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c234537..cc9ddc2 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -278,15 +278,7 @@ namespace OpenSim.Framework.Servers.HttpServer
278 Thread.Sleep(1000); // let the world move 278 Thread.Sleep(1000); // let the world move
279 279
280 foreach (Thread t in m_workerThreads) 280 foreach (Thread t in m_workerThreads)
281 { 281 Watchdog.AbortThread(t.ManagedThreadId);
282 try
283 {
284 t.Abort();
285 }
286 catch
287 {
288 }
289 }
290 282
291 try 283 try
292 { 284 {