diff options
Diffstat (limited to 'OpenSim/Grid/AssetServer/AssetHttpServer.cs')
-rw-r--r-- | OpenSim/Grid/AssetServer/AssetHttpServer.cs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs index 31cb379..9546891 100644 --- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs +++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs | |||
@@ -26,15 +26,10 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.IO; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Text.RegularExpressions; | 32 | using System.Text.RegularExpressions; |
33 | using System.Threading; | ||
34 | //using OpenSim.CAPS; | ||
35 | using Nwc.XmlRpc; | ||
36 | using System.Collections; | ||
37 | using OpenSim.Framework.Console; | ||
38 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
39 | 34 | ||
40 | namespace OpenSim.Grid.AssetServer | 35 | namespace OpenSim.Grid.AssetServer |
@@ -69,9 +64,9 @@ namespace OpenSim.Grid.AssetServer | |||
69 | response.KeepAlive = false; | 64 | response.KeepAlive = false; |
70 | response.SendChunked = false; | 65 | response.SendChunked = false; |
71 | 66 | ||
72 | System.IO.Stream body = request.InputStream; | 67 | Stream body = request.InputStream; |
73 | System.Text.Encoding encoding = System.Text.Encoding.UTF8; | 68 | Encoding encoding = Encoding.UTF8; |
74 | System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); | 69 | StreamReader reader = new StreamReader(body, encoding); |
75 | 70 | ||
76 | string requestBody = reader.ReadToEnd(); | 71 | string requestBody = reader.ReadToEnd(); |
77 | body.Close(); | 72 | body.Close(); |
@@ -114,7 +109,7 @@ namespace OpenSim.Grid.AssetServer | |||
114 | 109 | ||
115 | Encoding Windows1252Encoding = Encoding.GetEncoding(1252); | 110 | Encoding Windows1252Encoding = Encoding.GetEncoding(1252); |
116 | byte[] buffer = Windows1252Encoding.GetBytes(responseString); | 111 | byte[] buffer = Windows1252Encoding.GetBytes(responseString); |
117 | System.IO.Stream output = response.OutputStream; | 112 | Stream output = response.OutputStream; |
118 | response.SendChunked = false; | 113 | response.SendChunked = false; |
119 | response.ContentLength64 = buffer.Length; | 114 | response.ContentLength64 = buffer.Length; |
120 | output.Write(buffer, 0, buffer.Length); | 115 | output.Write(buffer, 0, buffer.Length); |