OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2010-01-11 08:00:03 +00:00
parent 20e748205e ff55ae0eb2
commit 8452c0869d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Application/OpenSim.cs
View File

@ -67,6 +67,7 @@ namespace OpenSim
base.ReadExtraConfigSettings(); base.ReadExtraConfigSettings();
IConfig startupConfig = m_config.Source.Configs["Startup"]; IConfig startupConfig = m_config.Source.Configs["Startup"];
IConfig networkConfig = m_config.Source.Configs["Network"];
int stpMaxThreads = 15; int stpMaxThreads = 15;
@ -80,7 +81,8 @@ namespace OpenSim
else else
m_consoleType= startupConfig.GetString("console", String.Empty); m_consoleType= startupConfig.GetString("console", String.Empty);
m_consolePort = (uint)startupConfig.GetInt("console_port", 0); if (networkConfig != null)
m_consolePort = (uint)networkConfig.GetInt("console_port", 0);
m_timedScript = startupConfig.GetString("timer_Script", "disabled"); m_timedScript = startupConfig.GetString("timer_Script", "disabled");
if (m_logFileAppender != null) if (m_logFileAppender != null)
{ {