diff options
| author | Melanie | 2013-04-05 00:03:33 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-05 00:03:33 +0100 |
| commit | c6b0942f97d57bf4272e5224f4a452114cd1477b (patch) | |
| tree | c739d446734fe8888bf53a87347da85e3d563ef0 /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * In between the fog, a moment of clarity. This fixes mantis 6570 (diff) | |
| download | opensim-SC_OLD-c6b0942f97d57bf4272e5224f4a452114cd1477b.zip opensim-SC_OLD-c6b0942f97d57bf4272e5224f4a452114cd1477b.tar.gz opensim-SC_OLD-c6b0942f97d57bf4272e5224f4a452114cd1477b.tar.bz2 opensim-SC_OLD-c6b0942f97d57bf4272e5224f4a452114cd1477b.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 97035e3..74954cc 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -454,7 +454,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 454 | } | 454 | } |
| 455 | 455 | ||
| 456 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); | 456 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); |
| 457 | 457 | resp.ReuseContext = true; | |
| 458 | HandleRequest(req, resp); | 458 | HandleRequest(req, resp); |
| 459 | 459 | ||
| 460 | 460 | ||