aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.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/Server/Handlers/Hypergrid/HeloServerConnector.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-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip
opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz
opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2
opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs')
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
index f306b1c..06eaf2e 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
91 m_HandlersType = handlersType; 91 m_HandlersType = handlersType;
92 } 92 }
93 93
94 public override byte[] Handle(string path, Stream requestData, 94 protected override byte[] ProcessRequest(string path, Stream requestData,
95 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 95 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
96 { 96 {
97 return OKResponse(httpResponse); 97 return OKResponse(httpResponse);