aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
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/Grid/AssetServer
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/Grid/AssetServer')
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index fcf99cd..c776c36 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
30using System.Reflection; 31using System.Reflection;
31using System.Text; 32using System.Text;
32using System.Xml; 33using System.Xml;
@@ -59,7 +60,8 @@ namespace OpenSim.Grid.AssetServer
59 m_assetProvider = assetProvider; 60 m_assetProvider = assetProvider;
60 } 61 }
61 62
62 public override byte[] Handle(string path, Stream request) 63 public override byte[] Handle(string path, Stream request,
64 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
63 { 65 {
64 string param = GetParam(path); 66 string param = GetParam(path);
65 byte[] result = new byte[] {}; 67 byte[] result = new byte[] {};
@@ -121,7 +123,8 @@ namespace OpenSim.Grid.AssetServer
121 private OpenAsset_Main m_assetManager; 123 private OpenAsset_Main m_assetManager;
122 private IAssetProvider m_assetProvider; 124 private IAssetProvider m_assetProvider;
123 125
124 public override byte[] Handle(string path, Stream request) 126 public override byte[] Handle(string path, Stream request,
127 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
125 { 128 {
126 string param = GetParam(path); 129 string param = GetParam(path);
127 130