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 844c5ae..079bcb1 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. " +
@@ -336,6 +341,7 @@ namespace OpenSim.Services.LLLoginService
336 private void FillOutRegionData(GridRegion destination) 341 private void FillOutRegionData(GridRegion destination)
337 { 342 {
338 IPEndPoint endPoint = destination.ExternalEndPoint; 343 IPEndPoint endPoint = destination.ExternalEndPoint;
344 if (endPoint == null) return;
339 SimAddress = endPoint.Address.ToString(); 345 SimAddress = endPoint.Address.ToString();
340 SimPort = (uint)endPoint.Port; 346 SimPort = (uint)endPoint.Port;
341 RegionX = (uint)destination.RegionLocX; 347 RegionX = (uint)destination.RegionLocX;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index db8a9cb..891c452 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -136,7 +136,8 @@ namespace OpenSim.Services.LLLoginService
136 Object[] args = new Object[] { config }; 136 Object[] args = new Object[] { config };
137 m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); 137 m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
138 m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args); 138 m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
139 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args); 139 Object[] authArgs = new Object[] { config, m_UserAccountService };
140 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, authArgs);
140 m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args); 141 m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
141 142
142 if (gridService != string.Empty) 143 if (gridService != string.Empty)
@@ -279,6 +280,12 @@ namespace OpenSim.Services.LLLoginService
279 return LLFailedLoginResponse.UserProblem; 280 return LLFailedLoginResponse.UserProblem;
280 } 281 }
281 282
283 if (account.UserLevel < 0)
284 {
285 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: Unverified account");
286 return LLFailedLoginResponse.UnverifiedAccountProblem;
287 }
288
282 if (account.UserLevel < m_MinLoginLevel) 289 if (account.UserLevel < m_MinLoginLevel)
283 { 290 {
284 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel); 291 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel);