diff options
| author | Melanie | 2009-10-04 05:49:16 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-04 05:49:16 +0100 |
| commit | 6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6 (patch) | |
| tree | 7e786c0ce436f42a60806629f3249658eab4884a /OpenSim/Server | |
| parent | Slightly better message with status code for WebException. (diff) | |
| parent | Closing another stream. (diff) | |
| download | opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.zip opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.gz opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.bz2 opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.xz | |
Merge branch 'diva-textures-osgrid'
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 2 |
3 files changed, 3 insertions, 3 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(); |
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs index d6ef22e..68bb01e 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | |||
| @@ -160,7 +160,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
| 160 | 160 | ||
| 161 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | 161 | httpResponse.StatusCode = (int)HttpStatusCode.OK; |
| 162 | 162 | ||
| 163 | return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); | 163 | return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); |
| 164 | } | 164 | } |
| 165 | } | 165 | } |
| 166 | 166 | ||
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 822edcb..3da72c7 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -161,7 +161,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 161 | 161 | ||
| 162 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | 162 | httpResponse.StatusCode = (int)HttpStatusCode.OK; |
| 163 | 163 | ||
| 164 | return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); | 164 | return Util.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); |
| 165 | } | 165 | } |
| 166 | } | 166 | } |
| 167 | 167 | ||