aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Capabilities/CapsHandlers.cs
diff options
context:
space:
mode:
authorDiva Canto2010-08-20 11:09:02 -0700
committerDiva Canto2010-08-20 11:09:02 -0700
commitf347d25675dbe84345d4b1bfbad041303c75e293 (patch)
tree64d5daddd0916b1480620a74da5fe27d9baccd4e /OpenSim/Framework/Capabilities/CapsHandlers.cs
parentCleaned up a few more things related to incoming agents. (diff)
downloadopensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.zip
opensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.tar.gz
opensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.tar.bz2
opensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.tar.xz
Unit test breakage fix.
Diffstat (limited to 'OpenSim/Framework/Capabilities/CapsHandlers.cs')
-rw-r--r--OpenSim/Framework/Capabilities/CapsHandlers.cs2
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;