diff options
author | Justin Clark-Casey (justincc) | 2013-02-27 20:33:11 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-02-27 20:33:11 +0000 |
commit | 056f11c297f601dcb3e0dccfc3f59c1c7281e461 (patch) | |
tree | 0dec8763034a9c813c38cd00715ef9d6c22dffcf /OpenSim/Framework/Servers | |
parent | Add regression test for llReleaseUrl() (and for llRequestUrl) (diff) | |
download | opensim-SC_OLD-056f11c297f601dcb3e0dccfc3f59c1c7281e461.zip opensim-SC_OLD-056f11c297f601dcb3e0dccfc3f59c1c7281e461.tar.gz opensim-SC_OLD-056f11c297f601dcb3e0dccfc3f59c1c7281e461.tar.bz2 opensim-SC_OLD-056f11c297f601dcb3e0dccfc3f59c1c7281e461.tar.xz |
Show http poll handlers in separate http (poll) section of "show http-handlers" console command instead of never showing them (due to a previous bug).
The code was assuming that poll handlers were also included in general http handlers but this was not the case.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/MainServer.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index 293887f..cfd34bb 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs | |||
@@ -227,9 +227,12 @@ namespace OpenSim.Framework.Servers | |||
227 | handlers.AppendFormat("\t{0}\n", s); | 227 | handlers.AppendFormat("\t{0}\n", s); |
228 | 228 | ||
229 | handlers.AppendFormat("* HTTP:\n"); | 229 | handlers.AppendFormat("* HTTP:\n"); |
230 | List<String> poll = httpServer.GetPollServiceHandlerKeys(); | ||
231 | foreach (String s in httpServer.GetHTTPHandlerKeys()) | 230 | foreach (String s in httpServer.GetHTTPHandlerKeys()) |
232 | handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty)); | 231 | handlers.AppendFormat("\t{0}\n", s); |
232 | |||
233 | handlers.AppendFormat("* HTTP (poll):\n"); | ||
234 | foreach (String s in httpServer.GetPollServiceHandlerKeys()) | ||
235 | handlers.AppendFormat("\t{0}\n", s); | ||
233 | 236 | ||
234 | handlers.AppendFormat("* JSONRPC:\n"); | 237 | handlers.AppendFormat("* JSONRPC:\n"); |
235 | foreach (String s in httpServer.GetJsonRpcHandlerKeys()) | 238 | foreach (String s in httpServer.GetJsonRpcHandlerKeys()) |