diff options
author | Diva Canto | 2009-09-28 18:53:07 -0700 |
---|---|---|
committer | Melanie | 2009-09-29 09:50:18 +0100 |
commit | 13c6202da9b2d21415a8ea6a28de9484492391fc (patch) | |
tree | 5759e5f1e9f0f91f57111acdbb8b884bea89f801 /OpenSim | |
parent | Merge branch 'master' into 0.6.7-post-fixes (diff) | |
download | opensim-SC-13c6202da9b2d21415a8ea6a28de9484492391fc.zip opensim-SC-13c6202da9b2d21415a8ea6a28de9484492391fc.tar.gz opensim-SC-13c6202da9b2d21415a8ea6a28de9484492391fc.tar.bz2 opensim-SC-13c6202da9b2d21415a8ea6a28de9484492391fc.tar.xz |
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/ServerMain.cs | 12 |
1 files changed, 8 insertions, 4 deletions
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 | |||
61 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); | 61 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); |
62 | string[] conns = connList.Split(new char[] {',', ' '}); | 62 | string[] conns = connList.Split(new char[] {',', ' '}); |
63 | 63 | ||
64 | int i = 0; | ||
64 | foreach (string c in conns) | 65 | foreach (string c in conns) |
65 | { | 66 | { |
66 | if (c == String.Empty) | 67 | if (c == String.Empty) |
@@ -100,11 +101,14 @@ namespace OpenSim.Server | |||
100 | IServiceConnector connector = null; | 101 | IServiceConnector connector = null; |
101 | try | 102 | try |
102 | { | 103 | { |
103 | Object[] modargs = new Object[] { m_Server.Config, server, | 104 | Object[] modargs = null; |
105 | if (configName != string.Empty) | ||
106 | { | ||
107 | modargs = new Object[] { m_Server.Config, server, | ||
104 | configName }; | 108 | configName }; |
105 | connector = ServerUtils.LoadPlugin<IServiceConnector>(conn, | 109 | connector = ServerUtils.LoadPlugin<IServiceConnector>(conn, |
106 | modargs); | 110 | modargs); |
107 | 111 | } | |
108 | if (connector == null) | 112 | if (connector == null) |
109 | { | 113 | { |
110 | modargs = new Object[] { m_Server.Config, server }; | 114 | modargs = new Object[] { m_Server.Config, server }; |