diff options
| author | Justin Clark-Casey (justincc) | 2010-08-20 19:36:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-20 19:36:04 +0100 |
| commit | 5155915de136d75a305ab83c0685c78444d63d22 (patch) | |
| tree | e2423377553fd8966ea6d9b4eba4c3126b3fe538 /OpenSim/Framework/Capabilities/CapsHandlers.cs | |
| parent | Some code cleanup for console command "create region". (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.zip opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.tar.gz opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.tar.bz2 opensim-SC_OLD-5155915de136d75a305ab83c0685c78444d63d22.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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; |