aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index c9f2cfa..cfa94ea 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -53,6 +53,7 @@ namespace OpenSim
53 protected string m_shutdownCommandsFile; 53 protected string m_shutdownCommandsFile;
54 protected bool m_gui = false; 54 protected bool m_gui = false;
55 protected string m_consoleType = "local"; 55 protected string m_consoleType = "local";
56 protected uint m_consolePort = 0;
56 57
57 private string m_timedScript = "disabled"; 58 private string m_timedScript = "disabled";
58 private Timer m_scriptTimer; 59 private Timer m_scriptTimer;
@@ -79,6 +80,7 @@ namespace OpenSim
79 else 80 else
80 m_consoleType= startupConfig.GetString("console", String.Empty); 81 m_consoleType= startupConfig.GetString("console", String.Empty);
81 82
83 m_consolePort = (uint)startupConfig.GetInt("console_port", 0);
82 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 84 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
83 if (m_logFileAppender != null) 85 if (m_logFileAppender != null)
84 { 86 {
@@ -151,7 +153,16 @@ namespace OpenSim
151 base.StartupSpecific(); 153 base.StartupSpecific();
152 154
153 if (m_console is RemoteConsole) 155 if (m_console is RemoteConsole)
154 ((RemoteConsole)m_console).SetServer(m_httpServer); 156 {
157 if (m_consolePort == 0)
158 {
159 ((RemoteConsole)m_console).SetServer(m_httpServer);
160 }
161 else
162 {
163 ((RemoteConsole)m_console).SetServer(MainServer.GetHttpServer(m_consolePort));
164 }
165 }
155 166
156 //Run Startup Commands 167 //Run Startup Commands
157 if (String.IsNullOrEmpty(m_startupCommandsFile)) 168 if (String.IsNullOrEmpty(m_startupCommandsFile))