OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.

remotes/origin/0.6.7-post-fixes
Diva Canto 2009-09-28 18:53:07 -07:00 committed by Melanie
parent fe3760e4a2
commit 13c6202da9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Server/ServerMain.cs
View File

@ -61,6 +61,7 @@ namespace OpenSim.Server
string connList = serverConfig.GetString("ServiceConnectors", String.Empty); string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
string[] conns = connList.Split(new char[] {',', ' '}); string[] conns = connList.Split(new char[] {',', ' '});
int i = 0;
foreach (string c in conns) foreach (string c in conns)
{ {
if (c == String.Empty) if (c == String.Empty)
@ -100,11 +101,14 @@ namespace OpenSim.Server
IServiceConnector connector = null; IServiceConnector connector = null;
try try
{ {
Object[] modargs = new Object[] { m_Server.Config, server, Object[] modargs = null;
if (configName != string.Empty)
{
modargs = new Object[] { m_Server.Config, server,
configName }; configName };
connector = ServerUtils.LoadPlugin<IServiceConnector>(conn, connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
modargs); modargs);
}
if (connector == null) if (connector == null)
{ {
modargs = new Object[] { m_Server.Config, server }; modargs = new Object[] { m_Server.Config, server };