diff options
author | Melanie | 2010-01-11 07:59:13 +0000 |
---|---|---|
committer | Melanie | 2010-01-11 07:59:13 +0000 |
commit | ff55ae0eb210e542d483d04779a9c96210f01691 (patch) | |
tree | e2f50bc85ed0815c29e94fb6d8d2c3bab35de0c7 | |
parent | Add the console port setting to ROBUST, too (diff) | |
download | opensim-SC-ff55ae0eb210e542d483d04779a9c96210f01691.zip opensim-SC-ff55ae0eb210e542d483d04779a9c96210f01691.tar.gz opensim-SC-ff55ae0eb210e542d483d04779a9c96210f01691.tar.bz2 opensim-SC-ff55ae0eb210e542d483d04779a9c96210f01691.tar.xz |
Make console_port work.
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index cfa94ea..e09d730 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -67,6 +67,7 @@ namespace OpenSim | |||
67 | base.ReadExtraConfigSettings(); | 67 | base.ReadExtraConfigSettings(); |
68 | 68 | ||
69 | IConfig startupConfig = m_config.Source.Configs["Startup"]; | 69 | IConfig startupConfig = m_config.Source.Configs["Startup"]; |
70 | IConfig networkConfig = m_config.Source.Configs["Network"]; | ||
70 | 71 | ||
71 | int stpMaxThreads = 15; | 72 | int stpMaxThreads = 15; |
72 | 73 | ||
@@ -80,7 +81,8 @@ namespace OpenSim | |||
80 | else | 81 | else |
81 | m_consoleType= startupConfig.GetString("console", String.Empty); | 82 | m_consoleType= startupConfig.GetString("console", String.Empty); |
82 | 83 | ||
83 | m_consolePort = (uint)startupConfig.GetInt("console_port", 0); | 84 | if (networkConfig != null) |
85 | m_consolePort = (uint)networkConfig.GetInt("console_port", 0); | ||
84 | m_timedScript = startupConfig.GetString("timer_Script", "disabled"); | 86 | m_timedScript = startupConfig.GetString("timer_Script", "disabled"); |
85 | if (m_logFileAppender != null) | 87 | if (m_logFileAppender != null) |
86 | { | 88 | { |