diff options
| author | Diva Canto | 2014-05-22 10:16:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-22 10:16:19 -0700 |
| commit | b7c7293c7aa7bb37085eaf6740e10a268aecf608 (patch) | |
| tree | 55022934c63bea8fd9fbd31be2df016cf5593d9a /OpenSim/Addons/OfflineIM | |
| parent | Fixed a problem with detaching attachments in situations where the user's ass... (diff) | |
| parent | Fix mantis 6973. Prevent BOM being prefixed to message XML which was causing ... (diff) | |
| download | opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.zip opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.gz opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.bz2 opensim-SC-b7c7293c7aa7bb37085eaf6740e10a268aecf608.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs | 4 |
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(); |