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/Caps.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/Caps.cs')
| -rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index da953bb..0db7bb9 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
| @@ -142,7 +142,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 142 | 142 | ||
| 143 | m_httpListenPort = httpPort; | 143 | m_httpListenPort = httpPort; |
| 144 | 144 | ||
| 145 | if (httpServer.UseSSL) | 145 | if (httpServer != null && httpServer.UseSSL) |
| 146 | { | 146 | { |
| 147 | m_httpListenPort = httpServer.SSLPort; | 147 | m_httpListenPort = httpServer.SSLPort; |
| 148 | httpListen = httpServer.SSLCommonName; | 148 | httpListen = httpServer.SSLCommonName; |
| @@ -151,7 +151,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 151 | 151 | ||
| 152 | m_agentID = agent; | 152 | m_agentID = agent; |
| 153 | m_dumpAssetsToFile = dumpAssetsToFile; | 153 | m_dumpAssetsToFile = dumpAssetsToFile; |
| 154 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, httpServer.UseSSL); | 154 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL); |
| 155 | m_regionName = regionName; | 155 | m_regionName = regionName; |
| 156 | } | 156 | } |
| 157 | 157 | ||