aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer/AssetHttpServer.cs
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Grid/AssetServer/AssetHttpServer.cs
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetServer/AssetHttpServer.cs15
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*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Text; 31using System.Text;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using System.Threading;
34//using OpenSim.CAPS;
35using Nwc.XmlRpc;
36using System.Collections;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
39 34
40namespace OpenSim.Grid.AssetServer 35namespace 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);