diff options
| author | UbitUmarov | 2017-08-16 05:05:57 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-08-16 05:05:57 +0100 |
| commit | 6d4b0a8ce3713eb45170f50b71d295ebaef0e51d (patch) | |
| tree | ba57d22e92ae6cadef8af599a2aa4f2a78057fce /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | fix merge issues (diff) | |
| parent | Merge branch 'master' into BulletSim2017 (diff) | |
| download | opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.zip opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.gz opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.bz2 opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -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 ce4503c..ca67d84 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1970,7 +1970,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1970 | Hashtable headerdata = (Hashtable)responsedata["headers"]; | 1970 | Hashtable headerdata = (Hashtable)responsedata["headers"]; |
| 1971 | 1971 | ||
| 1972 | foreach (string header in headerdata.Keys) | 1972 | foreach (string header in headerdata.Keys) |
| 1973 | response.AddHeader(header, (string)headerdata[header]); | 1973 | response.AddHeader(header, headerdata[header].ToString()); |
| 1974 | } | 1974 | } |
| 1975 | 1975 | ||
| 1976 | byte[] buffer; | 1976 | byte[] buffer; |