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/Interfaces | |
| 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 'OpenSim/Framework/Servers/HttpServer/Interfaces')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs index 33a1663..f61b090 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs | |||
| @@ -128,11 +128,5 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 128 | /// <param name="value">string containing the header field | 128 | /// <param name="value">string containing the header field |
| 129 | /// value</param> | 129 | /// value</param> |
| 130 | void AddHeader(string key, string value); | 130 | void AddHeader(string key, string value); |
| 131 | |||
| 132 | /// <summary> | ||
| 133 | /// Send the response back to the remote client | ||
| 134 | /// </summary> | ||
| 135 | void Send(); | ||
| 136 | } | 131 | } |
| 137 | } | 132 | } \ No newline at end of file |
| 138 | |||