aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer
diff options
context:
space:
mode:
authorMelanie2009-12-23 21:21:22 +0000
committerMelanie2009-12-23 21:21:22 +0000
commitf2d2073f2bd01f182c1b2238af9ba212ca999fd0 (patch)
tree8ee2d879559aaad7f3df47023069899420232da7 /OpenSim/Framework/Servers/HttpServer
parentFix a bounds exception I came across in IAR restore (diff)
parentChange in how the Library returns its descendant folders, so that it includes... (diff)
downloadopensim-SC-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.zip
opensim-SC-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.tar.gz
opensim-SC-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.tar.bz2
opensim-SC-f2d2073f2bd01f182c1b2238af9ba212ca999fd0.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 08f1bec..857c584 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -322,15 +322,15 @@ namespace OpenSim.Framework.Servers.HttpServer
322 HandleRequest(req, resp); 322 HandleRequest(req, resp);
323 } 323 }
324 324
325 public void ConvertIHttpClientContextToOSHttp(object stateinfo) 325 // public void ConvertIHttpClientContextToOSHttp(object stateinfo)
326 { 326 // {
327 HttpServerContextObj objstate = (HttpServerContextObj)stateinfo; 327 // HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
328 328
329 OSHttpRequest request = objstate.oreq; 329 // OSHttpRequest request = objstate.oreq;
330 OSHttpResponse resp = objstate.oresp; 330 // OSHttpResponse resp = objstate.oresp;
331 331
332 HandleRequest(request,resp); 332 // HandleRequest(request,resp);
333 } 333 // }
334 334
335 public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response) 335 public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
336 { 336 {