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

Fixed mantis #6609 -- LoadPlugin error messages on Robust.

user_profiles
Diva Canto 2013-05-13 13:07:39 -07:00
parent af1fa95875
commit 4194d935ec
5 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Base/ServerUtils.cs
View File

@ -286,7 +286,7 @@ namespace OpenSim.Server.Base
e.InnerException == null ? e.Message : e.InnerException.Message, e.InnerException == null ? e.Message : e.InnerException.Message,
e.StackTrace); e.StackTrace);
} }
m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1}", dllName, e.Message); m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length);
return null; return null;
} }

8
OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
View File

@ -76,10 +76,14 @@ namespace OpenSim.Server.Handlers.Hypergrid
server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy)); server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy));
} }
public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server) public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, string configName)
: this(config, server, null) : this(config, server, (ISimulationService)null)
{ {
} }
public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server)
: this(config, server, String.Empty)
{
}
} }
} }

7
OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs
View File

@ -54,10 +54,15 @@ namespace OpenSim.Server.Handlers.Hypergrid
private IInstantMessage m_IMService; private IInstantMessage m_IMService;
public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : public InstantMessageServerConnector(IConfigSource config, IHttpServer server) :
this(config, server, null) this(config, server, (IInstantMessageSimConnector)null)
{ {
} }
public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) :
this(config, server)
{
}
public InstantMessageServerConnector(IConfigSource config, IHttpServer server, IInstantMessageSimConnector simConnector) : public InstantMessageServerConnector(IConfigSource config, IHttpServer server, IInstantMessageSimConnector simConnector) :
base(config, server, String.Empty) base(config, server, String.Empty)
{ {

7
OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
View File

@ -62,10 +62,15 @@ namespace OpenSim.Server.Handlers.Hypergrid
private bool m_VerifyCallers = false; private bool m_VerifyCallers = false;
public UserAgentServerConnector(IConfigSource config, IHttpServer server) : public UserAgentServerConnector(IConfigSource config, IHttpServer server) :
this(config, server, null) this(config, server, (IFriendsSimConnector)null)
{ {
} }
public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) :
this(config, server)
{
}
public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) :
base(config, server, String.Empty) base(config, server, String.Empty)
{ {

9
OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
View File

@ -60,8 +60,8 @@ namespace OpenSim.Server.Handlers.Login
InitializeHandlers(server); InitializeHandlers(server);
} }
public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) : public LLLoginServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
base(config, server, String.Empty) base(config, server, configName)
{ {
string loginService = ReadLocalServiceFromConfig(config); string loginService = ReadLocalServiceFromConfig(config);
@ -72,6 +72,11 @@ namespace OpenSim.Server.Handlers.Login
InitializeHandlers(server); InitializeHandlers(server);
} }
public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) :
this(config, server, String.Empty)
{
}
private string ReadLocalServiceFromConfig(IConfigSource config) private string ReadLocalServiceFromConfig(IConfigSource config)
{ {
IConfig serverConfig = config.Configs["LoginService"]; IConfig serverConfig = config.Configs["LoginService"];