aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorubit2012-09-27 01:16:22 +0200
committerubit2012-09-27 01:16:22 +0200
commit5482c086f01d830ac1eeb87a880615326a92a9f4 (patch)
tree5c5029462ffa01859b5555122c3be5bb55fe6588
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentcreate a new PollServiceHttpRequest req per loop since they can be sent to (diff)
downloadopensim-SC_OLD-5482c086f01d830ac1eeb87a880615326a92a9f4.zip
opensim-SC_OLD-5482c086f01d830ac1eeb87a880615326a92a9f4.tar.gz
opensim-SC_OLD-5482c086f01d830ac1eeb87a880615326a92a9f4.tar.bz2
opensim-SC_OLD-5482c086f01d830ac1eeb87a880615326a92a9f4.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c09bf14..4be8bf4 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -321,13 +321,9 @@ namespace OpenSim.Framework.Servers.HttpServer
321 321
322 private void PoolWorkerJob() 322 private void PoolWorkerJob()
323 { 323 {
324 PollServiceHttpRequest req;
325 StreamReader str;
326
327// while (true)
328 while (m_running) 324 while (m_running)
329 { 325 {
330 req = m_requests.Dequeue(5000); 326 PollServiceHttpRequest req = m_requests.Dequeue(5000);
331 327
332 Watchdog.UpdateThread(); 328 Watchdog.UpdateThread();
333 if (req != null) 329 if (req != null)