diff options
author | Melanie Thielker | 2009-05-18 11:43:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-18 11:43:37 +0000 |
commit | cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40 (patch) | |
tree | 268e2332a35ce9de3cff6ff573f4ad2b807d0d20 /OpenSim/Servers/Base/ServicesServerBase.cs | |
parent | From: Alan Webb <alan_webb@us.ibm.com> (diff) | |
download | opensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.zip opensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.tar.gz opensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.tar.bz2 opensim-SC_OLD-cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40.tar.xz |
Move the connectors under services for reasons of application logic. Remove
the user server skeleton in preparation for introducing a generic server
Diffstat (limited to 'OpenSim/Servers/Base/ServicesServerBase.cs')
-rw-r--r-- | OpenSim/Servers/Base/ServicesServerBase.cs | 5 |
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. |