diff options
| author | Melanie | 2012-06-21 01:10:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-21 01:10:13 +0100 |
| commit | eab211f94d33f9c77a63344072a79cb66707c0ff (patch) | |
| tree | 4ec906bf15a6738a1a2443ccc23f83c85ef3fa0b /OpenSim/Framework/Servers/HttpServer | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea... (diff) | |
| download | opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.zip opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.gz opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.bz2 opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -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; |