diff options
| author | Melanie | 2009-10-04 05:49:16 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-04 05:49:16 +0100 |
| commit | 6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6 (patch) | |
| tree | 7e786c0ce436f42a60806629f3249658eab4884a /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Slightly better message with status code for WebException. (diff) | |
| parent | Closing another stream. (diff) | |
| download | opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.zip opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.gz opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.bz2 opensim-SC_OLD-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.xz | |
Merge branch 'diva-textures-osgrid'
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
| -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 6c63c6c..942fed9 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -979,7 +979,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 979 | } | 979 | } |
| 980 | 980 | ||
| 981 | // response.ContentType = "application/llsd+json"; | 981 | // response.ContentType = "application/llsd+json"; |
| 982 | // return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse)); | 982 | // return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse)); |
| 983 | response.ContentType = "application/llsd+xml"; | 983 | response.ContentType = "application/llsd+xml"; |
| 984 | return OSDParser.SerializeLLSDXmlBytes(llsdResponse); | 984 | return OSDParser.SerializeLLSDXmlBytes(llsdResponse); |
| 985 | } | 985 | } |