Merge branch 'ubitwork' into avination

avinationmerge
Melanie 2012-09-26 23:49:02 +02:00
commit 6cf51c329a
1 changed files with 1 additions and 5 deletions

View File

@ -321,13 +321,9 @@ namespace OpenSim.Framework.Servers.HttpServer
private void PoolWorkerJob() private void PoolWorkerJob()
{ {
PollServiceHttpRequest req;
StreamReader str;
// while (true)
while (m_running) while (m_running)
{ {
req = m_requests.Dequeue(5000); PollServiceHttpRequest req = m_requests.Dequeue(5000);
Watchdog.UpdateThread(); Watchdog.UpdateThread();
if (req != null) if (req != null)