diff options
| author | Justin Clark-Casey (justincc) | 2011-04-20 01:02:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-04-20 01:02:40 +0100 |
| commit | ccc26f74436f0e3069587efd96497053e4129c3c (patch) | |
| tree | eb12030259e5797288c181e6be13e61c06756f9e /OpenSim/Framework | |
| parent | synchronize Robust.HG.ini.example FreeSWITCH config with other config files (diff) | |
| download | opensim-SC_OLD-ccc26f74436f0e3069587efd96497053e4129c3c.zip opensim-SC_OLD-ccc26f74436f0e3069587efd96497053e4129c3c.tar.gz opensim-SC_OLD-ccc26f74436f0e3069587efd96497053e4129c3c.tar.bz2 opensim-SC_OLD-ccc26f74436f0e3069587efd96497053e4129c3c.tar.xz | |
Get Viewer 2 voice working with OpenSim.
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ccec9b7..ba89e21 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -430,7 +430,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 430 | string path = request.RawUrl; | 430 | string path = request.RawUrl; |
| 431 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 431 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
| 432 | 432 | ||
| 433 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 433 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
| 434 | 434 | ||
| 435 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 435 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
| 436 | { | 436 | { |