aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs6
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs9
2 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 9ec744f..a4b3cbd 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Services.LLLoginService
55 public static LLFailedLoginResponse InventoryProblem; 55 public static LLFailedLoginResponse InventoryProblem;
56 public static LLFailedLoginResponse DeadRegionProblem; 56 public static LLFailedLoginResponse DeadRegionProblem;
57 public static LLFailedLoginResponse LoginBlockedProblem; 57 public static LLFailedLoginResponse LoginBlockedProblem;
58 public static LLFailedLoginResponse UnverifiedAccountProblem;
58 public static LLFailedLoginResponse AlreadyLoggedInProblem; 59 public static LLFailedLoginResponse AlreadyLoggedInProblem;
59 public static LLFailedLoginResponse InternalError; 60 public static LLFailedLoginResponse InternalError;
60 61
@@ -75,6 +76,10 @@ namespace OpenSim.Services.LLLoginService
75 LoginBlockedProblem = new LLFailedLoginResponse("presence", 76 LoginBlockedProblem = new LLFailedLoginResponse("presence",
76 "Logins are currently restricted. Please try again later.", 77 "Logins are currently restricted. Please try again later.",
77 "false"); 78 "false");
79 UnverifiedAccountProblem = new LLFailedLoginResponse("presence",
80 "Your account has not yet been verified. Please check " +
81 "your email and click the provided link.",
82 "false");
78 AlreadyLoggedInProblem = new LLFailedLoginResponse("presence", 83 AlreadyLoggedInProblem = new LLFailedLoginResponse("presence",
79 "You appear to be already logged in. " + 84 "You appear to be already logged in. " +
80 "If this is not the case please wait for your session to timeout. " + 85 "If this is not the case please wait for your session to timeout. " +
@@ -375,6 +380,7 @@ namespace OpenSim.Services.LLLoginService
375 private void FillOutRegionData(GridRegion destination) 380 private void FillOutRegionData(GridRegion destination)
376 { 381 {
377 IPEndPoint endPoint = destination.ExternalEndPoint; 382 IPEndPoint endPoint = destination.ExternalEndPoint;
383 if (endPoint == null) return;
378 SimAddress = endPoint.Address.ToString(); 384 SimAddress = endPoint.Address.ToString();
379 SimPort = (uint)endPoint.Port; 385 SimPort = (uint)endPoint.Port;
380 RegionX = (uint)destination.RegionLocX; 386 RegionX = (uint)destination.RegionLocX;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 9acba11..06e05a9 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -140,7 +140,8 @@ namespace OpenSim.Services.LLLoginService
140 Object[] args = new Object[] { config }; 140 Object[] args = new Object[] { config };
141 m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); 141 m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
142 m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args); 142 m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
143 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args); 143 Object[] authArgs = new Object[] { config, m_UserAccountService };
144 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, authArgs);
144 m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args); 145 m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
145 146
146 if (gridService != string.Empty) 147 if (gridService != string.Empty)
@@ -284,6 +285,12 @@ namespace OpenSim.Services.LLLoginService
284 return LLFailedLoginResponse.UserProblem; 285 return LLFailedLoginResponse.UserProblem;
285 } 286 }
286 287
288 if (account.UserLevel < 0)
289 {
290 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: Unverified account");
291 return LLFailedLoginResponse.UnverifiedAccountProblem;
292 }
293
287 if (account.UserLevel < m_MinLoginLevel) 294 if (account.UserLevel < m_MinLoginLevel)
288 { 295 {
289 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel); 296 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel);