diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index f4b4156..ed733cf 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1057,7 +1057,21 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1057 | } | 1057 | } |
1058 | 1058 | ||
1059 | response.ContentType = "text/xml"; | 1059 | response.ContentType = "text/xml"; |
1060 | responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse); | 1060 | using (MemoryStream outs = new MemoryStream()) |
1061 | { | ||
1062 | using (XmlTextWriter writer = new XmlTextWriter(outs, Encoding.UTF8)) | ||
1063 | { | ||
1064 | writer.Formatting = Formatting.None; | ||
1065 | XmlRpcResponseSerializer.Singleton.Serialize(writer, xmlRpcResponse); | ||
1066 | writer.Flush(); | ||
1067 | outs.Flush(); | ||
1068 | outs.Position = 0; | ||
1069 | using (StreamReader sr = new StreamReader(outs)) | ||
1070 | { | ||
1071 | responseString = sr.ReadToEnd(); | ||
1072 | } | ||
1073 | } | ||
1074 | } | ||
1061 | } | 1075 | } |
1062 | else | 1076 | else |
1063 | { | 1077 | { |