aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAliciaRaven2014-05-22 00:51:33 +0100
committerOren Hurvitz2014-05-22 13:16:14 +0100
commit04aa13a086239b8d628821809bef9c9585c35f8f (patch)
tree48f9eb11bdc34bd0a66aa623d1f7b4082a7face5 /OpenSim
parentStore the Teleport Flags in the Circuit. This doesn't seem to be necessary, b... (diff)
downloadopensim-SC_OLD-04aa13a086239b8d628821809bef9c9585c35f8f.zip
opensim-SC_OLD-04aa13a086239b8d628821809bef9c9585c35f8f.tar.gz
opensim-SC_OLD-04aa13a086239b8d628821809bef9c9585c35f8f.tar.bz2
opensim-SC_OLD-04aa13a086239b8d628821809bef9c9585c35f8f.tar.xz
Fix mantis 6973. Prevent BOM being prefixed to message XML which was causing an exception when the service tried to read the data later on.
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
index 690c955..02084ff 100644
--- a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
+++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
@@ -104,7 +104,7 @@ namespace OpenSim.OfflineIM
104 using (MemoryStream mstream = new MemoryStream()) 104 using (MemoryStream mstream = new MemoryStream())
105 { 105 {
106 XmlWriterSettings settings = new XmlWriterSettings(); 106 XmlWriterSettings settings = new XmlWriterSettings();
107 settings.Encoding = Encoding.UTF8; 107 settings.Encoding = Util.UTF8NoBomEncoding;
108 108
109 using (XmlWriter writer = XmlWriter.Create(mstream, settings)) 109 using (XmlWriter writer = XmlWriter.Create(mstream, settings))
110 { 110 {
@@ -112,7 +112,7 @@ namespace OpenSim.OfflineIM
112 writer.Flush(); 112 writer.Flush();
113 } 113 }
114 114
115 imXml = Util.UTF8.GetString(mstream.ToArray()); 115 imXml = Util.UTF8NoBomEncoding.GetString(mstream.ToArray());
116 } 116 }
117 117
118 OfflineIMData data = new OfflineIMData(); 118 OfflineIMData data = new OfflineIMData();