aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordr scofield (aka dirk husemann)2009-08-12 14:49:59 +0200
committerdr scofield (aka dirk husemann)2009-08-12 14:49:59 +0200
commit613e6f07fcbe6f7c32938aca057f9890d2cda815 (patch)
tree1bb22a7a2234c8ca614906360b9d85e89dc411af
parentThanks jonc for a patch to ignore some Visual Studio and generated ini files. (diff)
downloadopensim-SC_OLD-613e6f07fcbe6f7c32938aca057f9890d2cda815.zip
opensim-SC_OLD-613e6f07fcbe6f7c32938aca057f9890d2cda815.tar.gz
opensim-SC_OLD-613e6f07fcbe6f7c32938aca057f9890d2cda815.tar.bz2
opensim-SC_OLD-613e6f07fcbe6f7c32938aca057f9890d2cda815.tar.xz
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.
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs6
1 files changed, 4 insertions, 2 deletions
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>