diff options
author | Melanie | 2010-01-11 03:49:05 +0000 |
---|---|---|
committer | Melanie | 2010-01-11 03:49:05 +0000 |
commit | 2b478a61d09a75f0c7e575b7e43807a6c9328e73 (patch) | |
tree | 049dacad8d38f8b4b7665b216405f7453d05f86c /OpenSim | |
parent | Add a console_port setting to let the rest console use a different port (diff) | |
download | opensim-SC-2b478a61d09a75f0c7e575b7e43807a6c9328e73.zip opensim-SC-2b478a61d09a75f0c7e575b7e43807a6c9328e73.tar.gz opensim-SC-2b478a61d09a75f0c7e575b7e43807a6c9328e73.tar.bz2 opensim-SC-2b478a61d09a75f0c7e575b7e43807a6c9328e73.tar.xz |
Add the console port setting to ROBUST, too
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index ed0210f..77184a4 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
@@ -49,6 +49,7 @@ namespace OpenSim.Server.Base | |||
49 | protected uint m_Port = 0; | 49 | protected uint m_Port = 0; |
50 | protected Dictionary<uint, BaseHttpServer> m_Servers = | 50 | protected Dictionary<uint, BaseHttpServer> m_Servers = |
51 | new Dictionary<uint, BaseHttpServer>(); | 51 | new Dictionary<uint, BaseHttpServer>(); |
52 | protected uint m_consolePort = 0; | ||
52 | 53 | ||
53 | public IHttpServer HttpServer | 54 | public IHttpServer HttpServer |
54 | { | 55 | { |
@@ -98,6 +99,7 @@ namespace OpenSim.Server.Base | |||
98 | Thread.CurrentThread.Abort(); | 99 | Thread.CurrentThread.Abort(); |
99 | } | 100 | } |
100 | 101 | ||
102 | m_consolePort = (uint)networkConfig.GetInt("ConsolePort", 0); | ||
101 | m_Port = port; | 103 | m_Port = port; |
102 | 104 | ||
103 | m_HttpServer = new BaseHttpServer(port); | 105 | m_HttpServer = new BaseHttpServer(port); |
@@ -111,7 +113,10 @@ namespace OpenSim.Server.Base | |||
111 | 113 | ||
112 | if (MainConsole.Instance is RemoteConsole) | 114 | if (MainConsole.Instance is RemoteConsole) |
113 | { | 115 | { |
114 | ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer); | 116 | if (m_consolePort == 0) |
117 | ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer); | ||
118 | else | ||
119 | ((RemoteConsole)MainConsole.Instance).SetServer(GetHttpServer(m_consolePort)); | ||
115 | } | 120 | } |
116 | } | 121 | } |
117 | } | 122 | } |