aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
authorUbitUmarov2016-12-06 07:40:45 +0000
committerUbitUmarov2016-12-06 07:40:45 +0000
commit44588ce45ef1d23ca8fedd453e9d2e54f1af27a3 (patch)
tree906178e458085aac28fb5721f67ae93d9b072758 /OpenSim/Capabilities
parentremove redundante check for ssl listener (diff)
downloadopensim-SC_OLD-44588ce45ef1d23ca8fedd453e9d2e54f1af27a3.zip
opensim-SC_OLD-44588ce45ef1d23ca8fedd453e9d2e54f1af27a3.tar.gz
opensim-SC_OLD-44588ce45ef1d23ca8fedd453e9d2e54f1af27a3.tar.bz2
opensim-SC_OLD-44588ce45ef1d23ca8fedd453e9d2e54f1af27a3.tar.xz
jenkins likes null httplisteners
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r--OpenSim/Capabilities/CapsHandlers.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs
index 6ec375b..6d3b9b5 100644
--- a/OpenSim/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Capabilities/CapsHandlers.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Capabilities
58 m_httpListener = httpListener; 58 m_httpListener = httpListener;
59 m_httpListenerHostName = httpListenerHostname; 59 m_httpListenerHostName = httpListenerHostname;
60 m_httpListenerPort = httpListenerPort; 60 m_httpListenerPort = httpListenerPort;
61 if (httpListener.UseSSL) 61 if (httpListener != null && httpListener.UseSSL)
62 m_useSSL = true; 62 m_useSSL = true;
63 else 63 else
64 m_useSSL = false; 64 m_useSSL = false;