From f4e8ac35560c9c57a4ce64a7b3ee4343086cd128 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Sep 2009 18:53:07 -0700
Subject: Fixed a bug that was causing exceptions to the thrown in ROBUST
 MainServer.

---
 OpenSim/Server/ServerMain.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 8851894..01f2649 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Server
             string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
             string[] conns = connList.Split(new char[] {',', ' '});
 
+            int i = 0;
             foreach (string c in conns)
             {
                 if (c == String.Empty)
@@ -100,11 +101,14 @@ namespace OpenSim.Server
                 IServiceConnector connector = null;
                 try
                 {
-                    Object[] modargs = new Object[] { m_Server.Config, server,
+                    Object[] modargs = null;
+                    if (configName != string.Empty)
+                    {
+                        modargs = new Object[] { m_Server.Config, server,
                             configName };
-                    connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
-                            modargs);
-
+                        connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
+                                modargs);
+                    }
                     if (connector == null)
                     {
                         modargs = new Object[] { m_Server.Config, server };
-- 
cgit v1.1