ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading modules with alternate configurations and ports into ROBUST.

Browse Source 
Make all current modules support the configuration name option
This commit is contained in:
Melanie
2009-09-29 09:56:17 +01:00
parent 13c6202da9
commit 691f1e8aa0
14 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Server/ServerMain.cs
View File

@@ -96,29 +96,23 @@ namespace OpenSim.Server
if (port != 0)
server = m_Server.GetHttpServer(port);
m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName);
if (port != m_Server.DefaultPort)
m_log.InfoFormat("[SERVER]: Loading {0} on port {1}", friendlyName, port);
else
m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName);
IServiceConnector connector = null;
try
{
Object[] modargs = null;
if (configName != string.Empty)
{
modargs = new Object[] { m_Server.Config, server,
configName };
connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
modargs);
}
if (connector == null)
{
modargs = new Object[] { m_Server.Config, server };
connector =
ServerUtils.LoadPlugin<IServiceConnector>(conn,
modargs);
}
}
catch (Exception)
Object[] modargs = new Object[] { m_Server.Config, server,
configName };
connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
modargs);
if (connector == null)
{
modargs = new Object[] { m_Server.Config, server };
connector =
ServerUtils.LoadPlugin<IServiceConnector>(conn,
modargs);
}
if (connector != null)