aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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/Region
parentRework some of the animation logic in an attempt to resolve #1318 (diff)
downloadopensim-SC_OLD-d725d1208bfbeae02f181cc6731f5a98dc7fce6d.zip
opensim-SC_OLD-d725d1208bfbeae02f181cc6731f5a98dc7fce6d.tar.gz
opensim-SC_OLD-d725d1208bfbeae02f181cc6731f5a98dc7fce6d.tar.bz2
opensim-SC_OLD-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/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7f13281..7d09c07 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net;
31using System.Reflection; 32using System.Reflection;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
@@ -681,7 +682,8 @@ namespace OpenSim
681 /// </summary> 682 /// </summary>
682 protected class SimStatusHandler : IStreamedRequestHandler 683 protected class SimStatusHandler : IStreamedRequestHandler
683 { 684 {
684 public byte[] Handle(string path, Stream request) 685 public byte[] Handle(string path, Stream request,
686 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
685 { 687 {
686 return Encoding.UTF8.GetBytes("OK"); 688 return Encoding.UTF8.GetBytes("OK");
687 } 689 }