1 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index aa6d315..81829c4 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Framework.Servers
         protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
         protected Dictionary<string, IRequestHandler> m_streamHandlers = new Dictionary<string, IRequestHandler>();
         protected int m_port;
+        protected bool m_ssl = false;
         protected bool m_firstcaps = true;
 
         public int Port
@@ -57,6 +58,12 @@ namespace OpenSim.Framework.Servers
             m_port = port;
         }
 
+        public BaseHttpServer(int port, bool ssl)
+        {
+            m_ssl = ssl;
+            BaseHttpServer(port);
+        }
+
         public void AddStreamHandler(IRequestHandler handler)
         {
             string httpMethod = handler.HttpMethod;
@@ -252,7 +259,14 @@ namespace OpenSim.Framework.Servers
                 MainLog.Instance.Verbose("HTTPD", "Spawned main thread OK");
                 m_httpListener = new HttpListener();
 
-                m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
+                if (!m_ssl)
+                {
+                    m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
+                }
+                else
+                {
+                    m_httpListener.Prefixes.Add("https://+:" + m_port + "/");
+                }
                 m_httpListener.Start();
 
                 HttpListenerContext context;