diff options
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index 7029289..f9227ac 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | |||
| @@ -36,7 +36,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 36 | /// OSHttpResponse is the OpenSim representation of an HTTP | 36 | /// OSHttpResponse is the OpenSim representation of an HTTP |
| 37 | /// response. | 37 | /// response. |
| 38 | /// </summary> | 38 | /// </summary> |
| 39 | public class OSHttpResponse | 39 | public class OSHttpResponse : IOSHttpResponse |
| 40 | { | 40 | { |
| 41 | /// <summary> | 41 | /// <summary> |
| 42 | /// Content type property. | 42 | /// Content type property. |
| @@ -275,7 +275,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 275 | } | 275 | } |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | |||
| 279 | protected IHttpResponse _httpResponse; | 278 | protected IHttpResponse _httpResponse; |
| 280 | private IHttpClientContext _httpClientContext; | 279 | private IHttpClientContext _httpClientContext; |
| 281 | 280 | ||
| @@ -331,4 +330,4 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 331 | } | 330 | } |
| 332 | 331 | ||
| 333 | } | 332 | } |
| 334 | } | 333 | } \ No newline at end of file |