diff options
author | UbitUmarov | 2016-12-08 23:39:55 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-08 23:39:55 +0000 |
commit | 806e75eefbba1a55a3cb22470af3adf8d87b8767 (patch) | |
tree | 7486de06cf4cf258a1a1e5b1ba4db172cf66cfbe /OpenSim/Region/Application/RegionApplicationBase.cs | |
parent | Merge branch 'master' into httptests (diff) | |
download | opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.zip opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.tar.gz opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.tar.bz2 opensim-SC-806e75eefbba1a55a3cb22470af3adf8d87b8767.tar.xz |
remove not needed sslport parameter
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/RegionApplicationBase.cs | 5 |
1 files changed, 2 insertions, 3 deletions
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 | |||
70 | Initialize(); | 70 | Initialize(); |
71 | 71 | ||
72 | uint mainport = m_networkServersInfo.HttpListenerPort; | 72 | uint mainport = m_networkServersInfo.HttpListenerPort; |
73 | uint mainSSLport =m_networkServersInfo.httpSSLPort; | 73 | uint mainSSLport = m_networkServersInfo.httpSSLPort; |
74 | 74 | ||
75 | if (m_networkServersInfo.HttpUsesSSL && (mainport == mainSSLport)) | 75 | if (m_networkServersInfo.HttpUsesSSL && (mainport == mainSSLport)) |
76 | { | 76 | { |
@@ -81,11 +81,10 @@ namespace OpenSim | |||
81 | { | 81 | { |
82 | m_httpServer = new BaseHttpServer( | 82 | m_httpServer = new BaseHttpServer( |
83 | mainSSLport, m_networkServersInfo.HttpUsesSSL, | 83 | mainSSLport, m_networkServersInfo.HttpUsesSSL, |
84 | mainSSLport, m_networkServersInfo.HttpSSLCN, | 84 | m_networkServersInfo.HttpSSLCN, |
85 | m_networkServersInfo.HttpSSLCertPath, m_networkServersInfo.HttpSSLCNCertPass); | 85 | m_networkServersInfo.HttpSSLCertPath, m_networkServersInfo.HttpSSLCNCertPass); |
86 | m_httpServer.Start(true,true); | 86 | m_httpServer.Start(true,true); |
87 | MainServer.AddHttpServer(m_httpServer); | 87 | MainServer.AddHttpServer(m_httpServer); |
88 | |||
89 | } | 88 | } |
90 | 89 | ||
91 | // unsecure main server | 90 | // unsecure main server |