From 257b1b517dec58bf902bac63bc7ab7080286d415 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Jun 2012 02:03:50 +0100
Subject: Add main instance to internal MainServer.m_Servers list to simplify
 internal logic.

This does require the server to be added before it is set as the main Instance
---
 OpenSim/Server/Base/HttpServerBase.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index d471559..7014303 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -138,6 +138,7 @@ namespace OpenSim.Server.Base
                 m_HttpServer = new BaseHttpServer(port, ssl_main, cert_path, cert_pass);
             }
 
+            MainServer.AddHttpServer(m_HttpServer);
             MainServer.Instance = m_HttpServer;
 
             // If https_listener = true, then add an ssl listener on the https_port...
@@ -157,16 +158,8 @@ namespace OpenSim.Server.Base
                     System.Console.WriteLine("Password for X509 certificate is missing, server can't start.");
                     Thread.CurrentThread.Abort();
                 }
-                // Add our https_server
-                BaseHttpServer server = null;
-                server = new BaseHttpServer(https_port, ssl_listener, cert_path, cert_pass);
-                if (server != null)
-                {
-                    m_Log.InfoFormat("[SERVER]: Starting HTTPS server on port {0}", https_port);
-                    m_Servers.Add(https_port,server);
-                }
-                else
-                    System.Console.WriteLine(String.Format("Failed to start HTTPS server on port {0}",https_port));
+
+                m_Servers.Add(https_port, new BaseHttpServer(https_port, ssl_listener, cert_path, cert_pass));
             }
         }
 
-- 
cgit v1.1