diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rwxr-xr-x | OpenSim/Region/Application/OpenSim.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 6a56a36..5cfca6c 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -49,6 +49,7 @@ using OpenSim.Framework.Monitoring; | |||
49 | using OpenSim.Region.Framework.Interfaces; | 49 | using OpenSim.Region.Framework.Interfaces; |
50 | using OpenSim.Region.Framework.Scenes; | 50 | using OpenSim.Region.Framework.Scenes; |
51 | using OpenSim.Services.Interfaces; | 51 | using OpenSim.Services.Interfaces; |
52 | using OpenSim.Framework.Servers.HttpServer; | ||
52 | 53 | ||
53 | namespace OpenSim | 54 | namespace OpenSim |
54 | { | 55 | { |
@@ -228,16 +229,14 @@ namespace OpenSim | |||
228 | m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase); | 229 | m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase); |
229 | } | 230 | } |
230 | 231 | ||
231 | if (m_console is RemoteConsole) | 232 | MethodInfo mi = m_console.GetType().GetMethod("SetServer", BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(BaseHttpServer) }, null); |
233 | |||
234 | if (mi != null) | ||
232 | { | 235 | { |
233 | if (m_consolePort == 0) | 236 | if (m_consolePort == 0) |
234 | { | 237 | mi.Invoke(m_console, new object[] { m_httpServer }); |
235 | ((RemoteConsole)m_console).SetServer(m_httpServer); | ||
236 | } | ||
237 | else | 238 | else |
238 | { | 239 | mi.Invoke(m_console, new object[] { MainServer.GetHttpServer(m_consolePort) }); |
239 | ((RemoteConsole)m_console).SetServer(MainServer.GetHttpServer(m_consolePort)); | ||
240 | } | ||
241 | } | 240 | } |
242 | 241 | ||
243 | // Hook up to the watchdog timer | 242 | // Hook up to the watchdog timer |