From 613e6f07fcbe6f7c32938aca057f9890d2cda815 Mon Sep 17 00:00:00 2001
From: dr scofield (aka dirk husemann)
Date: Wed, 12 Aug 2009 14:49:59 +0200
Subject: change 535cb0efc so that the default LLSD serialization format is
 llsd+xml instead of llsd+json --- the latter seems to break existing bots.
 this assumes that those bots that want llsd+json will properly signal that
 desire, if that is not the case, we need to revisit this. fixes mantis #3977.

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Servers')

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
                 }
             }
 
-            response.ContentType = "application/llsd+json";
-            return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse));
+            // response.ContentType = "application/llsd+json";
+            // return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse));
+            response.ContentType = "application/llsd+xml";
+            return OSDParser.SerializeLLSDXmlBytes(llsdResponse);
         }
 
         /// <summary>
-- 
cgit v1.1


From 50f29752f5888ac194a5146c475720c29ae3f172 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 13 Aug 2009 11:48:39 +0900
Subject: Formatting cleanup. Add copyright headers.

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

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
             string inputLine;
             int strcmp;
 
-            if (File.Exists( gitCommitFileName))
+            if (File.Exists(gitCommitFileName))
             {
                 StreamReader CommitFile = File.OpenText(gitCommitFileName);
                 buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine();
-- 
cgit v1.1