diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 6e3a58e..c4324e8 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -94,24 +94,21 @@ namespace OpenSim.Region.ClientStack | |||
94 | m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0}", m_httpServerPort); | 94 | m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0}", m_httpServerPort); |
95 | m_httpServer.Start(); | 95 | m_httpServer.Start(); |
96 | 96 | ||
97 | MainServer.AddHttpServer(m_httpServer); | ||
97 | MainServer.Instance = m_httpServer; | 98 | MainServer.Instance = m_httpServer; |
98 | 99 | ||
99 | // "OOB" Server | 100 | // "OOB" Server |
100 | if (m_networkServersInfo.ssl_listener) | 101 | if (m_networkServersInfo.ssl_listener) |
101 | { | 102 | { |
102 | BaseHttpServer server = null; | 103 | BaseHttpServer server = new BaseHttpServer( |
103 | server = new BaseHttpServer( | ||
104 | m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path, | 104 | m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path, |
105 | m_networkServersInfo.cert_pass); | 105 | m_networkServersInfo.cert_pass); |
106 | // Add the server to m_Servers | ||
107 | if(server != null) | ||
108 | { | ||
109 | m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port); | ||
110 | MainServer.AddHttpServer(server); | ||
111 | server.Start(); | ||
112 | } | ||
113 | } | ||
114 | 106 | ||
107 | m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port); | ||
108 | MainServer.AddHttpServer(server); | ||
109 | server.Start(); | ||
110 | } | ||
111 | |||
115 | base.StartupSpecific(); | 112 | base.StartupSpecific(); |
116 | } | 113 | } |
117 | 114 | ||