diff options
| author | Melanie | 2012-06-13 02:15:12 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-13 02:15:12 +0100 |
| commit | 12621201ba5751282f623fa3a7851c546976e47c (patch) | |
| tree | c5a1d99983c959c809966253b107e594a412042d /OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.zip opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.gz opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.bz2 opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index f9227ac..89fb5d4 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | |||
| @@ -321,13 +321,12 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 321 | { | 321 | { |
| 322 | _httpResponse.Body.Flush(); | 322 | _httpResponse.Body.Flush(); |
| 323 | _httpResponse.Send(); | 323 | _httpResponse.Send(); |
| 324 | |||
| 325 | } | 324 | } |
| 325 | |||
| 326 | public void FreeContext() | 326 | public void FreeContext() |
| 327 | { | 327 | { |
| 328 | if (_httpClientContext != null) | 328 | if (_httpClientContext != null) |
| 329 | _httpClientContext.Close(); | 329 | _httpClientContext.Close(); |
| 330 | } | 330 | } |
| 331 | |||
| 332 | } | 331 | } |
| 333 | } \ No newline at end of file | 332 | } \ No newline at end of file |