aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-15 00:40:12 +0100
committerJustin Clark-Casey (justincc)2012-06-15 00:40:12 +0100
commit6993a26ba599ae38dc6f66332980657d5621987a (patch)
tree7e055b0d22bb47bca6ca94ae185cc1525b484374 /OpenSim/Region
parentminor: Extend 'debug http' usage statement to 0..3 from 0..2 (diff)
downloadopensim-SC_OLD-6993a26ba599ae38dc6f66332980657d5621987a.zip
opensim-SC_OLD-6993a26ba599ae38dc6f66332980657d5621987a.tar.gz
opensim-SC_OLD-6993a26ba599ae38dc6f66332980657d5621987a.tar.bz2
opensim-SC_OLD-6993a26ba599ae38dc6f66332980657d5621987a.tar.xz
Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpecific() - a constructor can never return null.
Also adds some method doc to MainServer
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs14
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 6e78d6d..27a5879 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -99,17 +99,13 @@ namespace OpenSim.Region.ClientStack
99 // "OOB" Server 99 // "OOB" Server
100 if (m_networkServersInfo.ssl_listener) 100 if (m_networkServersInfo.ssl_listener)
101 { 101 {
102 BaseHttpServer server = null; 102 BaseHttpServer server = new BaseHttpServer(
103 server = new BaseHttpServer(
104 m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path, 103 m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
105 m_networkServersInfo.cert_pass); 104 m_networkServersInfo.cert_pass);
106 // Add the server to m_Servers 105
107 if(server != null) 106 m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
108 { 107 MainServer.AddHttpServer(server);
109 m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port); 108 server.Start();
110 MainServer.AddHttpServer(server);
111 server.Start();
112 }
113 } 109 }
114 110
115 base.StartupSpecific(); 111 base.StartupSpecific();