diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Login')
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 8 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index 5d672c3..072429a 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Login | |||
53 | 53 | ||
54 | private ILoginService m_LocalService; | 54 | private ILoginService m_LocalService; |
55 | private bool m_Proxy; | 55 | private bool m_Proxy; |
56 | 56 | ||
57 | 57 | ||
58 | public LLLoginHandlers(ILoginService service, bool hasProxy) | 58 | public LLLoginHandlers(ILoginService service, bool hasProxy) |
59 | { | 59 | { |
@@ -136,7 +136,7 @@ namespace OpenSim.Server.Handlers.Login | |||
136 | bool LibOMVclient = false; | 136 | bool LibOMVclient = false; |
137 | if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy") | 137 | if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy") |
138 | LibOMVclient = true; | 138 | LibOMVclient = true; |
139 | 139 | ||
140 | LoginResponse reply = null; | 140 | LoginResponse reply = null; |
141 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient); | 141 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient); |
142 | 142 | ||
@@ -279,11 +279,11 @@ namespace OpenSim.Server.Handlers.Login | |||
279 | sock.Close("success"); | 279 | sock.Close("success"); |
280 | } | 280 | } |
281 | }; | 281 | }; |
282 | 282 | ||
283 | sock.HandshakeAndUpgrade(); | 283 | sock.HandshakeAndUpgrade(); |
284 | 284 | ||
285 | } | 285 | } |
286 | 286 | ||
287 | 287 | ||
288 | private XmlRpcResponse FailedXMLRPCResponse() | 288 | private XmlRpcResponse FailedXMLRPCResponse() |
289 | { | 289 | { |
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs index f60e892..56ac3c2 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Server.Handlers.Login | |||
98 | m_DosProtectionOptions.ForgetTimeSpan = | 98 | m_DosProtectionOptions.ForgetTimeSpan = |
99 | TimeSpan.FromMilliseconds(serverConfig.GetInt("DOSForgiveClientAfterMS", 120000)); | 99 | TimeSpan.FromMilliseconds(serverConfig.GetInt("DOSForgiveClientAfterMS", 120000)); |
100 | m_DosProtectionOptions.ReportingName = "LOGINDOSPROTECTION"; | 100 | m_DosProtectionOptions.ReportingName = "LOGINDOSPROTECTION"; |
101 | 101 | ||
102 | 102 | ||
103 | return loginService; | 103 | return loginService; |
104 | } | 104 | } |
@@ -106,7 +106,7 @@ namespace OpenSim.Server.Handlers.Login | |||
106 | private void InitializeHandlers(IHttpServer server) | 106 | private void InitializeHandlers(IHttpServer server) |
107 | { | 107 | { |
108 | LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService, m_Proxy); | 108 | LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService, m_Proxy); |
109 | server.AddXmlRPCHandler("login_to_simulator", | 109 | server.AddXmlRPCHandler("login_to_simulator", |
110 | new XmlRpcBasicDOSProtector(loginHandlers.HandleXMLRPCLogin,loginHandlers.HandleXMLRPCLoginBlocked, | 110 | new XmlRpcBasicDOSProtector(loginHandlers.HandleXMLRPCLogin,loginHandlers.HandleXMLRPCLoginBlocked, |
111 | m_DosProtectionOptions).Process, false); | 111 | m_DosProtectionOptions).Process, false); |
112 | server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false); | 112 | server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false); |