diff options
Diffstat (limited to '')
5 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs index f3d678f..684d1a8 100644 --- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
52 | public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentPostHandler | 52 | public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentPostHandler |
53 | { | 53 | { |
54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private IGatekeeperService m_GatekeeperService; | 56 | private IGatekeeperService m_GatekeeperService; |
57 | 57 | ||
58 | public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy) : base("/foreignagent") | 58 | public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy) : base("/foreignagent") |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs index 6c79c60..870a5ef 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
48 | } | 48 | } |
49 | 49 | ||
50 | // Called from standalone configurations | 50 | // Called from standalone configurations |
51 | public HGFriendsServerConnector(IConfigSource config, IHttpServer server, string configName, IFriendsSimConnector localConn) | 51 | public HGFriendsServerConnector(IConfigSource config, IHttpServer server, string configName, IFriendsSimConnector localConn) |
52 | : base(config, server, configName) | 52 | : base(config, server, configName) |
53 | { | 53 | { |
54 | if (configName != string.Empty) | 54 | if (configName != string.Empty) |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 37b47ed..8116050 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
61 | m_UserAgentService = uas; | 61 | m_UserAgentService = uas; |
62 | m_FriendsLocalSimConnector = friendsConn; | 62 | m_FriendsLocalSimConnector = friendsConn; |
63 | 63 | ||
64 | m_log.DebugFormat("[HGFRIENDS HANDLER]: HGFriendsServerPostHandler is On ({0})", | 64 | m_log.DebugFormat("[HGFRIENDS HANDLER]: HGFriendsServerPostHandler is On ({0})", |
65 | (m_FriendsLocalSimConnector == null ? "robust" : "standalone")); | 65 | (m_FriendsLocalSimConnector == null ? "robust" : "standalone")); |
66 | 66 | ||
67 | if (m_TheService == null) | 67 | if (m_TheService == null) |
@@ -105,24 +105,24 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
105 | 105 | ||
106 | case "validate_friendship_offered": | 106 | case "validate_friendship_offered": |
107 | return ValidateFriendshipOffered(request); | 107 | return ValidateFriendshipOffered(request); |
108 | 108 | ||
109 | case "statusnotification": | 109 | case "statusnotification": |
110 | return StatusNotification(request); | 110 | return StatusNotification(request); |
111 | /* | 111 | /* |
112 | case "friendship_approved": | 112 | case "friendship_approved": |
113 | return FriendshipApproved(request); | 113 | return FriendshipApproved(request); |
114 | 114 | ||
115 | case "friendship_denied": | 115 | case "friendship_denied": |
116 | return FriendshipDenied(request); | 116 | return FriendshipDenied(request); |
117 | 117 | ||
118 | case "friendship_terminated": | 118 | case "friendship_terminated": |
119 | return FriendshipTerminated(request); | 119 | return FriendshipTerminated(request); |
120 | 120 | ||
121 | case "grant_rights": | 121 | case "grant_rights": |
122 | return GrantRights(request); | 122 | return GrantRights(request); |
123 | */ | 123 | */ |
124 | } | 124 | } |
125 | 125 | ||
126 | m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method); | 126 | m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method); |
127 | } | 127 | } |
128 | catch (Exception e) | 128 | catch (Exception e) |
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs index 8145a21..63f376d 100644 --- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
55 | 55 | ||
56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : | 56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : |
57 | this(config, server, (IInstantMessageSimConnector)null) | 57 | this(config, server, (IInstantMessageSimConnector)null) |
58 | { | 58 | { |
59 | } | 59 | } |
60 | 60 | ||
61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) : | 61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) : |
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index 37feabe..394b133 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
@@ -63,14 +63,14 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
63 | 63 | ||
64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : | 64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : |
65 | this(config, server, (IFriendsSimConnector)null) | 65 | this(config, server, (IFriendsSimConnector)null) |
66 | { | 66 | { |
67 | } | 67 | } |
68 | 68 | ||
69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) : | 69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) : |
70 | this(config, server) | 70 | this(config, server) |
71 | { | 71 | { |
72 | } | 72 | } |
73 | 73 | ||
74 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : | 74 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : |
75 | base(config, server, String.Empty) | 75 | base(config, server, String.Empty) |
76 | { | 76 | { |