aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-11 05:03:56 +0000
committerMelanie2010-01-11 05:03:56 +0000
commit15a11e9745f180fc637a41970498710b3511a53c (patch)
tree3acbfc9008c99c7325267e20842f9e0e8b94c73b
parentdust (diff)
downloadopensim-SC_OLD-15a11e9745f180fc637a41970498710b3511a53c.zip
opensim-SC_OLD-15a11e9745f180fc637a41970498710b3511a53c.tar.gz
opensim-SC_OLD-15a11e9745f180fc637a41970498710b3511a53c.tar.bz2
opensim-SC_OLD-15a11e9745f180fc637a41970498710b3511a53c.tar.xz
Refactor. Move MainServer init to a place with greener grass
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs1
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 7fdff60..74f11a4 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -77,7 +77,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
77 { 77 {
78 m_openSim = openSim; 78 m_openSim = openSim;
79 m_httpServer = openSim.HttpServer; 79 m_httpServer = openSim.HttpServer;
80 MainServer.Instance = m_httpServer;
81 80
82 InitialiseCommsManager(openSim); 81 InitialiseCommsManager(openSim);
83 } 82 }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index c7aeca14..fa6c9a8 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -111,6 +111,8 @@ namespace OpenSim.Region.ClientStack
111 m_log.Info("[REGION]: Starting HTTP server"); 111 m_log.Info("[REGION]: Starting HTTP server");
112 m_httpServer.Start(); 112 m_httpServer.Start();
113 113
114 MainServer.Instance = m_httpServer;
115
114 base.StartupSpecific(); 116 base.StartupSpecific();
115 } 117 }
116 118