aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2012-07-05 23:24:15 +0200
committerMelanie2012-07-05 23:24:15 +0200
commitbf292ce26f5742eaf1ae534320506b28f3a5492c (patch)
tree6ee73e83bbc41a08bd618abf6289944e6ee07b91 /OpenSim/Framework
parentAdd an EventType enum and Type field to the poll service event args. This allows (diff)
downloadopensim-SC-bf292ce26f5742eaf1ae534320506b28f3a5492c.zip
opensim-SC-bf292ce26f5742eaf1ae534320506b28f3a5492c.tar.gz
opensim-SC-bf292ce26f5742eaf1ae534320506b28f3a5492c.tar.bz2
opensim-SC-bf292ce26f5742eaf1ae534320506b28f3a5492c.tar.xz
Fix the boo-boo
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c7c7c13..06745f9 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -229,9 +229,9 @@ namespace OpenSim.Framework.Servers.HttpServer
229 if (m_running) 229 if (m_running)
230 { 230 {
231 if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LslHttp) 231 if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LslHttp)
232 m_slowRequests.Enqueue(req);
233 else
234 m_requests.Enqueue(req); 232 m_requests.Enqueue(req);
233 else
234 m_slowRequests.Enqueue(req);
235 } 235 }
236 } 236 }
237 237
@@ -252,7 +252,7 @@ namespace OpenSim.Framework.Servers.HttpServer
252 slowCount = 0; 252 slowCount = 0;
253 253
254 while (m_slowRequests.Count() > 0 && m_running) 254 while (m_slowRequests.Count() > 0 && m_running)
255 m_requests.Enqueue(m_retryRequests.Dequeue()); 255 m_requests.Enqueue(m_slowRequests.Dequeue());
256 } 256 }
257 } 257 }
258 } 258 }