diff options
| -rw-r--r-- | OpenSim/Capabilities/Caps.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Capabilities/CapsHandlers.cs | 28 |
2 files changed, 7 insertions, 23 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index 5e89c38..7ba65c9 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
| @@ -136,7 +136,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | m_agentID = agent; | 138 | m_agentID = agent; |
| 139 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL); | 139 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort); |
| 140 | m_regionName = regionName; | 140 | m_regionName = regionName; |
| 141 | m_capsActive.Reset(); | 141 | m_capsActive.Reset(); |
| 142 | } | 142 | } |
diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs index 04cede1..6ec375b 100644 --- a/OpenSim/Capabilities/CapsHandlers.cs +++ b/OpenSim/Capabilities/CapsHandlers.cs | |||
| @@ -53,31 +53,15 @@ namespace OpenSim.Framework.Capabilities | |||
| 53 | /// <param name="httpListener">base HTTP server</param> | 53 | /// <param name="httpListener">base HTTP server</param> |
| 54 | /// <param name="httpListenerHostname">host name of the HTTP server</param> | 54 | /// <param name="httpListenerHostname">host name of the HTTP server</param> |
| 55 | /// <param name="httpListenerPort">HTTP port</param> | 55 | /// <param name="httpListenerPort">HTTP port</param> |
| 56 | public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort) | 56 | public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort) |
| 57 | : this(httpListener,httpListenerHostname,httpListenerPort, false) | 57 | { |
| 58 | { | ||
| 59 | } | ||
| 60 | |||
| 61 | /// <summary></summary> | ||
| 62 | /// CapsHandlers is a cap handler container but also takes | ||
| 63 | /// care of adding and removing cap handlers to and from the | ||
| 64 | /// supplied BaseHttpServer. | ||
| 65 | /// </summary> | ||
| 66 | /// <param name="httpListener">base HTTP server</param> | ||
| 67 | /// <param name="httpListenerHostname">host name of the HTTP | ||
| 68 | /// server</param> | ||
| 69 | /// <param name="httpListenerPort">HTTP port</param> | ||
| 70 | public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https) | ||
| 71 | { | ||
| 72 | m_httpListener = httpListener; | 58 | m_httpListener = httpListener; |
| 73 | m_httpListenerHostName = httpListenerHostname; | 59 | m_httpListenerHostName = httpListenerHostname; |
| 74 | m_httpListenerPort = httpListenerPort; | 60 | m_httpListenerPort = httpListenerPort; |
| 75 | m_useSSL = https; | 61 | if (httpListener.UseSSL) |
| 76 | if (httpListener != null && m_useSSL) | 62 | m_useSSL = true; |
| 77 | { | 63 | else |
| 78 | m_httpListenerHostName = httpListener.SSLCommonName; | 64 | m_useSSL = false; |
| 79 | m_httpListenerPort = httpListener.SSLPort; | ||
| 80 | } | ||
| 81 | } | 65 | } |
| 82 | 66 | ||
| 83 | /// <summary> | 67 | /// <summary> |