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/Caps.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/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 | ||