From 15a11e9745f180fc637a41970498710b3511a53c Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Mon, 11 Jan 2010 05:03:56 +0000
Subject: [PATCH] Refactor. Move MainServer init to a place with greener grass

---
 .../CreateCommsManager/CreateCommsManagerPlugin.cs              | 1 -
 OpenSim/Region/ClientStack/RegionApplicationBase.cs             | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 7fdff603cb..74f11a4071 100644
--- 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);
         }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index c7aeca14e3..fa6c9a8ce9 100644
--- 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();
         }