diff options
author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
---|---|---|
committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Server/Handlers/UserAccounts | |
parent | UbitOde: remove useless water collider from active code. (diff) | |
parent | Merge branch 'avination' into careminster (diff) | |
download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index 3fd69ae..72551ef 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
@@ -195,9 +195,9 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
195 | } | 195 | } |
196 | 196 | ||
197 | string xmlString = ServerUtils.BuildXmlResponse(result); | 197 | string xmlString = ServerUtils.BuildXmlResponse(result); |
198 | |||
198 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); | 199 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); |
199 | UTF8Encoding encoding = new UTF8Encoding(); | 200 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
200 | return encoding.GetBytes(xmlString); | ||
201 | } | 201 | } |
202 | 202 | ||
203 | byte[] StoreAccount(Dictionary<string, object> request) | 203 | byte[] StoreAccount(Dictionary<string, object> request) |
@@ -353,8 +353,7 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
353 | private byte[] ResultToBytes(Dictionary<string, object> result) | 353 | private byte[] ResultToBytes(Dictionary<string, object> result) |
354 | { | 354 | { |
355 | string xmlString = ServerUtils.BuildXmlResponse(result); | 355 | string xmlString = ServerUtils.BuildXmlResponse(result); |
356 | UTF8Encoding encoding = new UTF8Encoding(); | 356 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
357 | return encoding.GetBytes(xmlString); | ||
358 | } | 357 | } |
359 | } | 358 | } |
360 | } | 359 | } \ No newline at end of file |