diff options
author | ubit | 2012-07-17 02:07:21 +0200 |
---|---|---|
committer | ubit | 2012-07-17 02:07:21 +0200 |
commit | e925b0654d12c534ff9f837355ad43483dbd22cb (patch) | |
tree | e8a05e918e55ec8034dd724c38f143aac31493b2 /OpenSim/Server/Handlers/Presence | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | Merge branch 'avination' into ubitwork (diff) | |
download | opensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.zip opensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.gz opensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.bz2 opensim-SC-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Server/Handlers/Presence')
-rw-r--r-- | OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs index 6b6a552..2d67c6d 100644 --- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | |||
@@ -199,9 +199,9 @@ namespace OpenSim.Server.Handlers.Presence | |||
199 | result["result"] = pinfo.ToKeyValuePairs(); | 199 | result["result"] = pinfo.ToKeyValuePairs(); |
200 | 200 | ||
201 | string xmlString = ServerUtils.BuildXmlResponse(result); | 201 | string xmlString = ServerUtils.BuildXmlResponse(result); |
202 | |||
202 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); | 203 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); |
203 | UTF8Encoding encoding = new UTF8Encoding(); | 204 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
204 | return encoding.GetBytes(xmlString); | ||
205 | } | 205 | } |
206 | 206 | ||
207 | byte[] GetAgents(Dictionary<string, object> request) | 207 | byte[] GetAgents(Dictionary<string, object> request) |
@@ -240,12 +240,11 @@ namespace OpenSim.Server.Handlers.Presence | |||
240 | } | 240 | } |
241 | 241 | ||
242 | string xmlString = ServerUtils.BuildXmlResponse(result); | 242 | string xmlString = ServerUtils.BuildXmlResponse(result); |
243 | |||
243 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); | 244 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); |
244 | UTF8Encoding encoding = new UTF8Encoding(); | 245 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
245 | return encoding.GetBytes(xmlString); | ||
246 | } | 246 | } |
247 | 247 | ||
248 | |||
249 | private byte[] SuccessResult() | 248 | private byte[] SuccessResult() |
250 | { | 249 | { |
251 | XmlDocument doc = new XmlDocument(); | 250 | XmlDocument doc = new XmlDocument(); |