diff options
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 2a97528..7a244ff 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -443,7 +443,7 @@ namespace OpenSim.Framework.Servers | |||
443 | string inputLine; | 443 | string inputLine; |
444 | int strcmp; | 444 | int strcmp; |
445 | 445 | ||
446 | if (File.Exists( gitCommitFileName)) | 446 | if (File.Exists(gitCommitFileName)) |
447 | { | 447 | { |
448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); | 448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); |
449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); | 449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); |
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index c74eab1..75c9310 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -964,8 +964,10 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
964 | } | 964 | } |
965 | } | 965 | } |
966 | 966 | ||
967 | response.ContentType = "application/llsd+json"; | 967 | // response.ContentType = "application/llsd+json"; |
968 | return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse)); | 968 | // return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse)); |
969 | response.ContentType = "application/llsd+xml"; | ||
970 | return OSDParser.SerializeLLSDXmlBytes(llsdResponse); | ||
969 | } | 971 | } |
970 | 972 | ||
971 | /// <summary> | 973 | /// <summary> |