diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/RegionApplicationBase.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs index ba92fd6..83a9fff 100644 --- a/OpenSim/Region/Application/RegionApplicationBase.cs +++ b/OpenSim/Region/Application/RegionApplicationBase.cs | |||
@@ -57,9 +57,9 @@ namespace OpenSim | |||
57 | public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } } | 57 | public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } } |
58 | public ISimulationDataService SimulationDataService { get { return m_simulationDataService; } } | 58 | public ISimulationDataService SimulationDataService { get { return m_simulationDataService; } } |
59 | public IEstateDataService EstateDataService { get { return m_estateDataService; } } | 59 | public IEstateDataService EstateDataService { get { return m_estateDataService; } } |
60 | 60 | ||
61 | protected abstract void Initialize(); | 61 | protected abstract void Initialize(); |
62 | 62 | ||
63 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); | 63 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); |
64 | 64 | ||
65 | protected override void StartupSpecific() | 65 | protected override void StartupSpecific() |
@@ -68,11 +68,11 @@ namespace OpenSim | |||
68 | 68 | ||
69 | Initialize(); | 69 | Initialize(); |
70 | 70 | ||
71 | m_httpServer | 71 | m_httpServer |
72 | = new BaseHttpServer( | 72 | = new BaseHttpServer( |
73 | m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort, | 73 | m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort, |
74 | m_networkServersInfo.HttpSSLCN); | 74 | m_networkServersInfo.HttpSSLCN); |
75 | 75 | ||
76 | if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort)) | 76 | if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort)) |
77 | { | 77 | { |
78 | m_log.Error("[REGION SERVER]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports"); | 78 | m_log.Error("[REGION SERVER]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports"); |
@@ -107,7 +107,7 @@ namespace OpenSim | |||
107 | server.Start(); | 107 | server.Start(); |
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | base.StartupSpecific(); | 111 | base.StartupSpecific(); |
112 | } | 112 | } |
113 | 113 | ||