aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-09 14:13:51 -0700
committerDiva Canto2013-07-09 14:13:51 -0700
commitd0dfb744b206d3bd002ed72f415f177c6b04226b (patch)
treedba29f24667d254371abb726e2842700c189dfdf /OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
parentPut guards on a bunch of exception-inducing code, as seen in logs from load t... (diff)
parentBulletSim: add parameter to optionally disable vehicle linear deflection. (diff)
downloadopensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip
opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz
opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2
opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
index 1f17fee..0305dee 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer
48 m_restMethod = restMethod; 48 m_restMethod = restMethod;
49 } 49 }
50 50
51 public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 51 protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
52 { 52 {
53 Encoding encoding = Encoding.UTF8; 53 Encoding encoding = Encoding.UTF8;
54 StreamReader streamReader = new StreamReader(request, encoding); 54 StreamReader streamReader = new StreamReader(request, encoding);