diff options
author | Melanie | 2009-10-05 10:17:23 +0100 |
---|---|---|
committer | Melanie | 2009-10-05 10:17:23 +0100 |
commit | 0744292b479446eb1ebec828afafacc0189709ca (patch) | |
tree | 3c43b5f425aff61d3625b75b7aef35ce5062ae56 /OpenSim/Server/Base/ServerUtils.cs | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Make the asset connector async Get overload return false if the asset (diff) | |
download | opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC-0744292b479446eb1ebec828afafacc0189709ca.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Server/Base/ServerUtils.cs')
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 9beadd8..0964caa 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Server.Base | |||
87 | public static byte[] SerializeResult(XmlSerializer xs, object data) | 87 | public static byte[] SerializeResult(XmlSerializer xs, object data) |
88 | { | 88 | { |
89 | MemoryStream ms = new MemoryStream(); | 89 | MemoryStream ms = new MemoryStream(); |
90 | XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); | 90 | XmlTextWriter xw = new XmlTextWriter(ms, Util.UTF8); |
91 | xw.Formatting = Formatting.Indented; | 91 | xw.Formatting = Formatting.Indented; |
92 | xs.Serialize(xw, data); | 92 | xs.Serialize(xw, data); |
93 | xw.Flush(); | 93 | xw.Flush(); |