aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-11 03:29:24 +0000
committerMelanie2010-01-11 03:29:24 +0000
commite966e51b89bdc0fc36482621f8954e5faffc8fbf (patch)
tree94696a2cba39c0d018dd85717a20a8ac449dc3db
parentWhitespace cleanup (diff)
downloadopensim-SC_OLD-e966e51b89bdc0fc36482621f8954e5faffc8fbf.zip
opensim-SC_OLD-e966e51b89bdc0fc36482621f8954e5faffc8fbf.tar.gz
opensim-SC_OLD-e966e51b89bdc0fc36482621f8954e5faffc8fbf.tar.bz2
opensim-SC_OLD-e966e51b89bdc0fc36482621f8954e5faffc8fbf.tar.xz
Add a console_port setting to let the rest console use a different port
from the region server
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/MainServer.cs4
-rw-r--r--OpenSim/Region/Application/OpenSim.cs13
-rw-r--r--bin/OpenSim.ini.example1
3 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 7da4893..84cc05e 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
32{ 32{
33 public class MainServer 33 public class MainServer
34 { 34 {
35 private static BaseHttpServer instance; 35 private static BaseHttpServer instance = null;
36 private static Dictionary<uint, BaseHttpServer> m_Servers = 36 private static Dictionary<uint, BaseHttpServer> m_Servers =
37 new Dictionary<uint, BaseHttpServer>(); 37 new Dictionary<uint, BaseHttpServer>();
38 38
@@ -46,7 +46,7 @@ namespace OpenSim.Framework
46 { 46 {
47 if (port == 0) 47 if (port == 0)
48 return Instance; 48 return Instance;
49 if (port == Instance.Port) 49 if (instance != null && port == Instance.Port)
50 return Instance; 50 return Instance;
51 51
52 if (m_Servers.ContainsKey(port)) 52 if (m_Servers.ContainsKey(port))
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))
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index af6345a..d09dc67 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -326,6 +326,7 @@
326 ConsoleUser = "Test" 326 ConsoleUser = "Test"
327 ConsolePass = "secret" 327 ConsolePass = "secret"
328 http_listener_port = 9000 328 http_listener_port = 9000
329 console_port = 0
329 default_location_x = 1000 330 default_location_x = 1000
330 default_location_y = 1000 331 default_location_y = 1000
331 332