diff options
| author | Diva Canto | 2012-09-21 07:45:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-21 07:45:26 -0700 |
| commit | f4cc19968cdbb72fd43cc950f6c8ef160f896438 (patch) | |
| tree | 80859de8ea03de99d8951235bc59e017c7012bd4 /OpenSim/Framework/Servers/MainServer.cs | |
| parent | HG 2.0: added asset import/export policies at the sim too. (diff) | |
| parent | minor: Make slow outgoing request log messages consistent with other log mess... (diff) | |
| download | opensim-SC-f4cc19968cdbb72fd43cc950f6c8ef160f896438.zip opensim-SC-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.gz opensim-SC-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.bz2 opensim-SC-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/MainServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/MainServer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index 72f9cce..4b61b18 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs | |||
| @@ -231,9 +231,9 @@ namespace OpenSim.Framework.Servers | |||
| 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 | 233 | ||
| 234 | handlers.AppendFormat("* Agent:\n"); | 234 | // handlers.AppendFormat("* Agent:\n"); |
| 235 | foreach (String s in httpServer.GetAgentHandlerKeys()) | 235 | // foreach (String s in httpServer.GetAgentHandlerKeys()) |
| 236 | handlers.AppendFormat("\t{0}\n", s); | 236 | // handlers.AppendFormat("\t{0}\n", s); |
| 237 | 237 | ||
| 238 | handlers.AppendFormat("* LLSD:\n"); | 238 | handlers.AppendFormat("* LLSD:\n"); |
| 239 | foreach (String s in httpServer.GetLLSDHandlerKeys()) | 239 | foreach (String s in httpServer.GetLLSDHandlerKeys()) |