aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorDr Scofield2008-05-19 11:38:35 +0000
committerDr Scofield2008-05-19 11:38:35 +0000
commitd725d1208bfbeae02f181cc6731f5a98dc7fce6d (patch)
treefd27fe08b43c7ef5d15ee0e829947f06d97e8375 /OpenSim/Framework/Communications/Capabilities
parentRework some of the animation logic in an attempt to resolve #1318 (diff)
downloadopensim-SC-d725d1208bfbeae02f181cc6731f5a98dc7fce6d.zip
opensim-SC-d725d1208bfbeae02f181cc6731f5a98dc7fce6d.tar.gz
opensim-SC-d725d1208bfbeae02f181cc6731f5a98dc7fce6d.tar.bz2
opensim-SC-d725d1208bfbeae02f181cc6731f5a98dc7fce6d.tar.xz
adding OSHttpRequest and OSHttpResponse which wrap HttpListenerRequest and HttpListenerResponse respectively.
enhancing IStreamHandler and IStreamedHandler interfaces so that OSHttp{Request,Response} get passed in, allowing RestHandlers to set response status code, redirections, etc.
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 8683cea..c5cb268 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -27,6 +27,7 @@
27 27
28using System.Collections; 28using System.Collections;
29using System.IO; 29using System.IO;
30using System.Net;
30using System.Text; 31using System.Text;
31using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
32 33
@@ -43,7 +44,8 @@ namespace OpenSim.Framework.Communications.Capabilities
43 m_method = method; 44 m_method = method;
44 } 45 }
45 46
46 public override byte[] Handle(string path, Stream request) 47 public override byte[] Handle(string path, Stream request,
48 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
47 { 49 {
48 //Encoding encoding = Encoding.UTF8; 50 //Encoding encoding = Encoding.UTF8;
49 //StreamReader streamReader = new StreamReader(request, false); 51 //StreamReader streamReader = new StreamReader(request, false);