aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorAleric Inglewood2013-08-04 19:20:10 +0200
committerteravus2013-09-22 21:10:01 -0500
commit7889e7757a7a3266c70bf0763f92c53b33d86b60 (patch)
treeca1c70369a52b1d226f6871175873e902a331836 /OpenSim/Framework/Servers
parentPreserve attachment point & position when attachment is rezzed in world (diff)
downloadopensim-SC_OLD-7889e7757a7a3266c70bf0763f92c53b33d86b60.zip
opensim-SC_OLD-7889e7757a7a3266c70bf0763f92c53b33d86b60.tar.gz
opensim-SC_OLD-7889e7757a7a3266c70bf0763f92c53b33d86b60.tar.bz2
opensim-SC_OLD-7889e7757a7a3266c70bf0763f92c53b33d86b60.tar.xz
Don't use 'Indented' formatting for RpcXml responses.
(cherry picked from commit 93abcde69043b175071e0bb752538d9730433f1d)
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index c4e569d..76b4257 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1056,7 +1056,21 @@ namespace OpenSim.Framework.Servers.HttpServer
1056 } 1056 }
1057 1057
1058 response.ContentType = "text/xml"; 1058 response.ContentType = "text/xml";
1059 responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse); 1059 using (MemoryStream outs = new MemoryStream())
1060 {
1061 using (XmlTextWriter writer = new XmlTextWriter(outs, Encoding.UTF8))
1062 {
1063 writer.Formatting = Formatting.None;
1064 XmlRpcResponseSerializer.Singleton.Serialize(writer, xmlRpcResponse);
1065 writer.Flush();
1066 outs.Flush();
1067 outs.Position = 0;
1068 using (StreamReader sr = new StreamReader(outs))
1069 {
1070 responseString = sr.ReadToEnd();
1071 }
1072 }
1073 }
1060 } 1074 }
1061 else 1075 else
1062 { 1076 {