aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/ServerMain.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/ServerMain.cs34
1 files changed, 14 insertions, 20 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 01f2649..a7b33c9 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -96,29 +96,23 @@ namespace OpenSim.Server
96 if (port != 0) 96 if (port != 0)
97 server = m_Server.GetHttpServer(port); 97 server = m_Server.GetHttpServer(port);
98 98
99 m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName); 99 if (port != m_Server.DefaultPort)
100 m_log.InfoFormat("[SERVER]: Loading {0} on port {1}", friendlyName, port);
101 else
102 m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName);
100 103
101 IServiceConnector connector = null; 104 IServiceConnector connector = null;
102 try 105
103 { 106 Object[] modargs = new Object[] { m_Server.Config, server,
104 Object[] modargs = null; 107 configName };
105 if (configName != string.Empty) 108 connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
106 { 109 modargs);
107 modargs = new Object[] { m_Server.Config, server, 110 if (connector == null)
108 configName };
109 connector = ServerUtils.LoadPlugin<IServiceConnector>(conn,
110 modargs);
111 }
112 if (connector == null)
113 {
114 modargs = new Object[] { m_Server.Config, server };
115 connector =
116 ServerUtils.LoadPlugin<IServiceConnector>(conn,
117 modargs);
118 }
119 }
120 catch (Exception)
121 { 111 {
112 modargs = new Object[] { m_Server.Config, server };
113 connector =
114 ServerUtils.LoadPlugin<IServiceConnector>(conn,
115 modargs);
122 } 116 }
123 117
124 if (connector != null) 118 if (connector != null)