diff options
author | UbitUmarov | 2016-12-06 07:26:26 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-06 07:26:26 +0000 |
commit | 8db69d2e02b13edb348a13a33c82eda3f7124636 (patch) | |
tree | 20bb771cbbdbbaa62387dc47cfb79085e55d53b2 /OpenSim/Capabilities/CapsHandlers.cs | |
parent | HG: fix the never ending avatar confirmation when 2 users from same grid made... (diff) | |
download | opensim-SC_OLD-8db69d2e02b13edb348a13a33c82eda3f7124636.zip opensim-SC_OLD-8db69d2e02b13edb348a13a33c82eda3f7124636.tar.gz opensim-SC_OLD-8db69d2e02b13edb348a13a33c82eda3f7124636.tar.bz2 opensim-SC_OLD-8db69d2e02b13edb348a13a33c82eda3f7124636.tar.xz |
remove redundante check for ssl listener
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/CapsHandlers.cs | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs index 04cede1..6ec375b 100644 --- a/OpenSim/Capabilities/CapsHandlers.cs +++ b/OpenSim/Capabilities/CapsHandlers.cs | |||
@@ -53,31 +53,15 @@ namespace OpenSim.Framework.Capabilities | |||
53 | /// <param name="httpListener">base HTTP server</param> | 53 | /// <param name="httpListener">base HTTP server</param> |
54 | /// <param name="httpListenerHostname">host name of the HTTP server</param> | 54 | /// <param name="httpListenerHostname">host name of the HTTP server</param> |
55 | /// <param name="httpListenerPort">HTTP port</param> | 55 | /// <param name="httpListenerPort">HTTP port</param> |
56 | public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort) | 56 | public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort) |
57 | : this(httpListener,httpListenerHostname,httpListenerPort, false) | 57 | { |
58 | { | ||
59 | } | ||
60 | |||
61 | /// <summary></summary> | ||
62 | /// CapsHandlers is a cap handler container but also takes | ||
63 | /// care of adding and removing cap handlers to and from the | ||
64 | /// supplied BaseHttpServer. | ||
65 | /// </summary> | ||
66 | /// <param name="httpListener">base HTTP server</param> | ||
67 | /// <param name="httpListenerHostname">host name of the HTTP | ||
68 | /// server</param> | ||
69 | /// <param name="httpListenerPort">HTTP port</param> | ||
70 | public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https) | ||
71 | { | ||
72 | m_httpListener = httpListener; | 58 | m_httpListener = httpListener; |
73 | m_httpListenerHostName = httpListenerHostname; | 59 | m_httpListenerHostName = httpListenerHostname; |
74 | m_httpListenerPort = httpListenerPort; | 60 | m_httpListenerPort = httpListenerPort; |
75 | m_useSSL = https; | 61 | if (httpListener.UseSSL) |
76 | if (httpListener != null && m_useSSL) | 62 | m_useSSL = true; |
77 | { | 63 | else |
78 | m_httpListenerHostName = httpListener.SSLCommonName; | 64 | m_useSSL = false; |
79 | m_httpListenerPort = httpListener.SSLPort; | ||
80 | } | ||
81 | } | 65 | } |
82 | 66 | ||
83 | /// <summary> | 67 | /// <summary> |