diff options
author | Melanie | 2012-09-26 23:49:02 +0200 |
---|---|---|
committer | Melanie | 2012-09-26 23:49:02 +0200 |
commit | 6cf51c329a8fad5a4564510b04db1f8b0235ff8c (patch) | |
tree | ac3f898a598138cd6875cac9b648415484b070d5 /OpenSim/Framework | |
parent | Streamline and improve llGetMass (diff) | |
parent | create a new PollServiceHttpRequest req per loop since they can be sent to (diff) | |
download | opensim-SC-6cf51c329a8fad5a4564510b04db1f8b0235ff8c.zip opensim-SC-6cf51c329a8fad5a4564510b04db1f8b0235ff8c.tar.gz opensim-SC-6cf51c329a8fad5a4564510b04db1f8b0235ff8c.tar.bz2 opensim-SC-6cf51c329a8fad5a4564510b04db1f8b0235ff8c.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 6 |
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) |