diff options
author | Melanie | 2012-06-26 10:49:37 +0200 |
---|---|---|
committer | Melanie | 2012-06-26 10:49:37 +0200 |
commit | 9a8de52940ea6d9ce430d8d51094a353eca7d3c5 (patch) | |
tree | 900381245784707596ce8c03214a8025e5109e2f /OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |
parent | Disable physics raycast until it can be seen to. Fix distance calculation (diff) | |
download | opensim-SC-9a8de52940ea6d9ce430d8d51094a353eca7d3c5.zip opensim-SC-9a8de52940ea6d9ce430d8d51094a353eca7d3c5.tar.gz opensim-SC-9a8de52940ea6d9ce430d8d51094a353eca7d3c5.tar.bz2 opensim-SC-9a8de52940ea6d9ce430d8d51094a353eca7d3c5.tar.xz |
Add an event to the poll service manager thread to allow starting it
when needed rather than once per second. That is just too slow!
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index 5e171f0..b39185f 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
@@ -89,9 +89,16 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
89 | continue; | 89 | continue; |
90 | } | 90 | } |
91 | 91 | ||
92 | Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd()); | 92 | try |
93 | m_server.DoHTTPGruntWork(responsedata, | 93 | { |
94 | Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd()); | ||
95 | m_server.DoHTTPGruntWork(responsedata, | ||
94 | new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext)); | 96 | new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext)); |
97 | } | ||
98 | catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream | ||
99 | { | ||
100 | // Ignore it, no need to reply | ||
101 | } | ||
95 | } | 102 | } |
96 | else | 103 | else |
97 | { | 104 | { |