From 806e75eefbba1a55a3cb22470af3adf8d87b8767 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 8 Dec 2016 23:39:55 +0000
Subject:  remove not needed sslport parameter

---
 OpenSim/Region/Application/RegionApplicationBase.cs                  | 5 ++---
 .../ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs      | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
index 77b0138..09940b5 100644
--- a/OpenSim/Region/Application/RegionApplicationBase.cs
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -70,7 +70,7 @@ namespace OpenSim
             Initialize();
 
             uint mainport = m_networkServersInfo.HttpListenerPort;
-            uint mainSSLport =m_networkServersInfo.httpSSLPort;
+            uint mainSSLport = m_networkServersInfo.httpSSLPort;
 
             if (m_networkServersInfo.HttpUsesSSL && (mainport == mainSSLport))
             {
@@ -81,11 +81,10 @@ namespace OpenSim
             {
                 m_httpServer = new BaseHttpServer(
                         mainSSLport, m_networkServersInfo.HttpUsesSSL,
-                        mainSSLport, m_networkServersInfo.HttpSSLCN,
+                        m_networkServersInfo.HttpSSLCN,
                         m_networkServersInfo.HttpSSLCertPath, m_networkServersInfo.HttpSSLCNCertPass);
                 m_httpServer.Start(true,true);
                 MainServer.AddHttpServer(m_httpServer);
-
             }
 
             // unsecure main server
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 507d9b8..54af246 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -59,13 +59,12 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             base.SetUp();
 
             uint port = 9999;
-            uint sslPort = 9998;
 
             // This is an unfortunate bit of clean up we have to do because MainServer manages things through static
             // variables and the VM is not restarted between tests.
             MainServer.RemoveHttpServer(port);
 
-            BaseHttpServer server = new BaseHttpServer(port, false, sslPort, "","","");
+            BaseHttpServer server = new BaseHttpServer(port, false, "","","");
             MainServer.AddHttpServer(server);
             MainServer.Instance = server;
 
-- 
cgit v1.1