Refactor. Move MainServer init to a place with greener grass

2010-01-11 05:03:56 +00:00 · 2010-01-11 05:03:56 +00:00 · 15a11e9745
parent 7e6980b20d
commit 15a11e9745
2 changed files with 2 additions and 1 deletions
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@ -77,7 +77,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
        {
            m_openSim = openSim;
            m_httpServer = openSim.HttpServer;
-            MainServer.Instance = m_httpServer;

            InitialiseCommsManager(openSim);
        }
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@ -111,6 +111,8 @@ namespace OpenSim.Region.ClientStack
            m_log.Info("[REGION]: Starting HTTP server");
            m_httpServer.Start();

+            MainServer.Instance = m_httpServer;
+
            base.StartupSpecific();
        }