From cb2ce61876c8953ad56b9eb6dfd79dcd26e8ec40 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 18 May 2009 11:43:37 +0000
Subject: Move the connectors under services for reasons of application logic.
 Remove the user server skeleton in preparation for introducing a generic
 server

---
 OpenSim/Servers/Base/ServicesServerBase.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Servers/Base')

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
 
             // Refresh the startupConfig post merge
             //
-            startupConfig = argvConfig.Configs["Startup"];
+            if (m_Config.Configs["Startup"] != null)
+            {
+                startupConfig = m_Config.Configs["Startup"];
+            }
 
             // Allow derived classes to load config before the console is
             // opened.
-- 
cgit v1.1