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/Capabilities | |
| 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_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/LLSDStreamHandler.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs index f5c728c..5df24b2 100644 --- a/OpenSim/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Capabilities/LLSDStreamHandler.cs | |||
| @@ -66,9 +66,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 66 | 66 | ||
| 67 | TResponse response = m_method(llsdRequest); | 67 | TResponse response = m_method(llsdRequest); |
| 68 | 68 | ||
| 69 | Encoding encoding = new UTF8Encoding(false); | 69 | return Util.UTF8NoBomEncoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); |
| 70 | |||
| 71 | return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); | ||
| 72 | } | 70 | } |
| 73 | } | 71 | } |
| 74 | } | 72 | } |