diff options
| author | BlueWall | 2012-06-16 06:29:49 -0400 |
|---|---|---|
| committer | BlueWall | 2012-06-16 06:29:49 -0400 |
| commit | fc1522ab609f69e198806b2b4bf730a61b1a4f0a (patch) | |
| tree | a647a53415c3cdf10bb8bee6275ad11a5b85af7b /OpenSim/Framework | |
| parent | Adjust Robust*.ini.examples V3 webprofile entries (diff) | |
| parent | Change read config paramter from max_urls_per_simulator to max_external_urls_... (diff) | |
| download | opensim-SC-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.zip opensim-SC-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.tar.gz opensim-SC-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.tar.bz2 opensim-SC-fc1522ab609f69e198806b2b4bf730a61b1a4f0a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index 2995421..35a8dee 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
| @@ -129,9 +129,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 129 | OSHttpResponse response | 129 | OSHttpResponse response |
| 130 | = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext); | 130 | = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext); |
| 131 | 131 | ||
| 132 | byte[] buffer | 132 | byte[] buffer = server.DoHTTPGruntWork(responsedata, response); |
| 133 | = server.DoHTTPGruntWork( | ||
| 134 | responsedata, new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext)); | ||
| 135 | 133 | ||
| 136 | response.SendChunked = false; | 134 | response.SendChunked = false; |
| 137 | response.ContentLength64 = buffer.Length; | 135 | response.ContentLength64 = buffer.Length; |