diff options
| author | Melanie | 2013-01-16 16:52:57 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 16:52:57 +0000 |
| commit | 9c99ed26ebe7cd2e42c10487e4ddfde0c934d921 (patch) | |
| tree | 536b2d6530fdda925203afddd27a4b9444e4d2a7 /OpenSim/Framework/Servers/MainServer.cs | |
| parent | Complete removal of the now unused state queue (diff) | |
| parent | Changed a couple of debug messages at the request of osgrid. (diff) | |
| download | opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.zip opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.gz opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.bz2 opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/MainServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/MainServer.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index ae7d515..293887f 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs | |||
| @@ -230,6 +230,10 @@ namespace OpenSim.Framework.Servers | |||
| 230 | List<String> poll = httpServer.GetPollServiceHandlerKeys(); | 230 | List<String> poll = httpServer.GetPollServiceHandlerKeys(); |
| 231 | foreach (String s in httpServer.GetHTTPHandlerKeys()) | 231 | foreach (String s in httpServer.GetHTTPHandlerKeys()) |
| 232 | handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty)); | 232 | handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty)); |
| 233 | |||
| 234 | handlers.AppendFormat("* JSONRPC:\n"); | ||
| 235 | foreach (String s in httpServer.GetJsonRpcHandlerKeys()) | ||
| 236 | handlers.AppendFormat("\t{0}\n", s); | ||
| 233 | 237 | ||
| 234 | // handlers.AppendFormat("* Agent:\n"); | 238 | // handlers.AppendFormat("* Agent:\n"); |
| 235 | // foreach (String s in httpServer.GetAgentHandlerKeys()) | 239 | // foreach (String s in httpServer.GetAgentHandlerKeys()) |