diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index c7aeca14..e683821 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -56,13 +56,6 @@ namespace OpenSim.Region.ClientStack | |||
56 | 56 | ||
57 | protected uint m_httpServerPort; | 57 | protected uint m_httpServerPort; |
58 | 58 | ||
59 | public CommunicationsManager CommunicationsManager | ||
60 | { | ||
61 | get { return m_commsManager; } | ||
62 | set { m_commsManager = value; } | ||
63 | } | ||
64 | protected CommunicationsManager m_commsManager; | ||
65 | |||
66 | protected StorageManager m_storageManager; | 59 | protected StorageManager m_storageManager; |
67 | 60 | ||
68 | protected ClientStackManager m_clientStackManager; | 61 | protected ClientStackManager m_clientStackManager; |
@@ -105,12 +98,14 @@ namespace OpenSim.Region.ClientStack | |||
105 | 98 | ||
106 | if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort)) | 99 | if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort)) |
107 | { | 100 | { |
108 | m_log.Error("[HTTP]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports"); | 101 | m_log.Error("[REGION SERVER]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports"); |
109 | } | 102 | } |
110 | 103 | ||
111 | m_log.Info("[REGION]: Starting HTTP server"); | 104 | m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0}", m_httpServerPort); |
112 | m_httpServer.Start(); | 105 | m_httpServer.Start(); |
113 | 106 | ||
107 | MainServer.Instance = m_httpServer; | ||
108 | |||
114 | base.StartupSpecific(); | 109 | base.StartupSpecific(); |
115 | } | 110 | } |
116 | 111 | ||
@@ -134,4 +129,4 @@ namespace OpenSim.Region.ClientStack | |||
134 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier); | 129 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier); |
135 | } | 130 | } |
136 | } | 131 | } |
137 | } | 132 | } \ No newline at end of file |