diff options
author | Melanie | 2010-08-21 00:32:26 +0100 |
---|---|---|
committer | Melanie | 2010-08-21 00:32:26 +0100 |
commit | f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4 (patch) | |
tree | 3ef10e646ddda95929142eb2c3774b42d0923b3b /OpenSim/Framework/Capabilities/CapsHandlers.cs | |
parent | Forward-port a small improvement to the land out connector (diff) | |
parent | Forward-port a small improvement to the land out connector (diff) | |
download | opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.zip opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.gz opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.bz2 opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Capabilities/CapsHandlers.cs')
-rw-r--r-- | OpenSim/Framework/Capabilities/CapsHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Capabilities/CapsHandlers.cs index f000aed..864e6dd 100644 --- a/OpenSim/Framework/Capabilities/CapsHandlers.cs +++ b/OpenSim/Framework/Capabilities/CapsHandlers.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Framework.Capabilities | |||
74 | m_httpListenerHostName = httpListenerHostname; | 74 | m_httpListenerHostName = httpListenerHostname; |
75 | m_httpListenerPort = httpListenerPort; | 75 | m_httpListenerPort = httpListenerPort; |
76 | m_useSSL = https; | 76 | m_useSSL = https; |
77 | if (m_useSSL) | 77 | if (httpListener != null && m_useSSL) |
78 | { | 78 | { |
79 | m_httpListenerHostName = httpListener.SSLCommonName; | 79 | m_httpListenerHostName = httpListener.SSLCommonName; |
80 | m_httpListenerPort = httpListener.SSLPort; | 80 | m_httpListenerPort = httpListener.SSLPort; |