diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs | 2 |
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); |