aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Servers/Base/ServicesServerBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Servers/Base/ServicesServerBase.cs')
-rw-r--r--OpenSim/Servers/Base/ServicesServerBase.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Servers/Base/ServicesServerBase.cs
index b090e8c..6129407 100644
--- a/OpenSim/Servers/Base/ServicesServerBase.cs
+++ b/OpenSim/Servers/Base/ServicesServerBase.cs
@@ -125,7 +125,10 @@ namespace OpenSim.Servers.Base
125 125
126 // Refresh the startupConfig post merge 126 // Refresh the startupConfig post merge
127 // 127 //
128 startupConfig = argvConfig.Configs["Startup"]; 128 if (m_Config.Configs["Startup"] != null)
129 {
130 startupConfig = m_Config.Configs["Startup"];
131 }
129 132
130 // Allow derived classes to load config before the console is 133 // Allow derived classes to load config before the console is
131 // opened. 134 // opened.