diff options
author | Diva Canto | 2013-05-13 13:07:39 -0700 |
---|---|---|
committer | Diva Canto | 2013-05-13 13:07:39 -0700 |
commit | 4194d935ecd21a922859a640cb28acec7e5bae45 (patch) | |
tree | 2e673266346c5561729f90414307c04ed2265e34 /OpenSim/Server/Handlers/Hypergrid | |
parent | Groups: Improve error handling on remote connector. (diff) | |
download | opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.zip opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.tar.gz opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.tar.bz2 opensim-SC_OLD-4194d935ecd21a922859a640cb28acec7e5bae45.tar.xz |
Fixed mantis #6609 -- LoadPlugin error messages on Robust.
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid')
3 files changed, 18 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs index 0d4990a..ffe2f36 100644 --- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | |||
@@ -76,10 +76,14 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
76 | server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy)); | 76 | server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy)); |
77 | } | 77 | } |
78 | 78 | ||
79 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server) | 79 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, string configName) |
80 | : this(config, server, null) | 80 | : this(config, server, (ISimulationService)null) |
81 | { | 81 | { |
82 | } | 82 | } |
83 | 83 | ||
84 | public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server) | ||
85 | : this(config, server, String.Empty) | ||
86 | { | ||
87 | } | ||
84 | } | 88 | } |
85 | } | 89 | } |
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs index 80eb5d2..8145a21 100644 --- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | |||
@@ -54,10 +54,15 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
54 | private IInstantMessage m_IMService; | 54 | private IInstantMessage m_IMService; |
55 | 55 | ||
56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : | 56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : |
57 | this(config, server, null) | 57 | this(config, server, (IInstantMessageSimConnector)null) |
58 | { | 58 | { |
59 | } | 59 | } |
60 | 60 | ||
61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) : | ||
62 | this(config, server) | ||
63 | { | ||
64 | } | ||
65 | |||
61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, IInstantMessageSimConnector simConnector) : | 66 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, IInstantMessageSimConnector simConnector) : |
62 | base(config, server, String.Empty) | 67 | base(config, server, String.Empty) |
63 | { | 68 | { |
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index db62aaa..b20f467 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
@@ -62,10 +62,15 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
62 | private bool m_VerifyCallers = false; | 62 | private bool m_VerifyCallers = false; |
63 | 63 | ||
64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : | 64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : |
65 | this(config, server, null) | 65 | this(config, server, (IFriendsSimConnector)null) |
66 | { | 66 | { |
67 | } | 67 | } |
68 | 68 | ||
69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) : | ||
70 | this(config, server) | ||
71 | { | ||
72 | } | ||
73 | |||
69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : | 74 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : |
70 | base(config, server, String.Empty) | 75 | base(config, server, String.Empty) |
71 | { | 76 | { |