diff options
| author | Melanie | 2012-07-13 02:27:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-13 02:27:16 +0100 |
| commit | 64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch) | |
| tree | 12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Server/Handlers/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff) | |
| download | opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Avatar')
| -rw-r--r-- | OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs index 3ee405c..393584e 100644 --- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs | |||
| @@ -121,8 +121,7 @@ namespace OpenSim.Server.Handlers.Avatar | |||
| 121 | 121 | ||
| 122 | string xmlString = ServerUtils.BuildXmlResponse(result); | 122 | string xmlString = ServerUtils.BuildXmlResponse(result); |
| 123 | 123 | ||
| 124 | UTF8Encoding encoding = new UTF8Encoding(); | 124 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
| 125 | return encoding.GetBytes(xmlString); | ||
| 126 | } | 125 | } |
| 127 | 126 | ||
| 128 | return FailureResult(); | 127 | return FailureResult(); |