aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-01-30 00:40:56 +0000
committerJustin Clark-Casey (justincc)2014-01-30 00:40:56 +0000
commitb73baeb4a454e493be03b2e0ed98ee1bca77e922 (patch)
treecc0a4050169540a2c618f373714cda177efd8d5d
parentAdd "show grid user" robust/standalone console command for debug purposes. (diff)
downloadopensim-SC_OLD-b73baeb4a454e493be03b2e0ed98ee1bca77e922.zip
opensim-SC_OLD-b73baeb4a454e493be03b2e0ed98ee1bca77e922.tar.gz
opensim-SC_OLD-b73baeb4a454e493be03b2e0ed98ee1bca77e922.tar.bz2
opensim-SC_OLD-b73baeb4a454e493be03b2e0ed98ee1bca77e922.tar.xz
Record whether login to home fails because no home set (UUID.Zero) or region not found.
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs29
1 files changed, 22 insertions, 7 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index fe43582..6a748fe 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -382,11 +382,30 @@ namespace OpenSim.Services.LLLoginService
382 // 382 //
383 GridRegion home = null; 383 GridRegion home = null;
384 GridUserInfo guinfo = m_GridUserService.LoggedIn(account.PrincipalID.ToString()); 384 GridUserInfo guinfo = m_GridUserService.LoggedIn(account.PrincipalID.ToString());
385 if (guinfo != null && (guinfo.HomeRegionID != UUID.Zero) && m_GridService != null) 385
386 // We are only going to complain about no home if the user actually tries to login there, to avoid
387 // spamming the console.
388 if (guinfo != null)
386 { 389 {
387 home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID); 390 if (guinfo.HomeRegionID == UUID.Zero && startLocation == "home")
391 {
392 m_log.WarnFormat(
393 "[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location but they have none set",
394 account.Name);
395 }
396 else if (m_GridService != null)
397 {
398 home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
399
400 if (home == null && startLocation == "home")
401 {
402 m_log.WarnFormat(
403 "[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location with ID {1} but this was not found.",
404 account.Name, guinfo.HomeRegionID);
405 }
406 }
388 } 407 }
389 if (guinfo == null) 408 else
390 { 409 {
391 // something went wrong, make something up, so that we don't have to test this anywhere else 410 // something went wrong, make something up, so that we don't have to test this anywhere else
392 guinfo = new GridUserInfo(); 411 guinfo = new GridUserInfo();
@@ -506,10 +525,6 @@ namespace OpenSim.Services.LLLoginService
506 525
507 if (home == null) 526 if (home == null)
508 { 527 {
509 m_log.WarnFormat(
510 "[LLOGIN SERVICE]: User {0} {1} tried to login to a 'home' start location but they have none set",
511 account.FirstName, account.LastName);
512
513 tryDefaults = true; 528 tryDefaults = true;
514 } 529 }
515 else 530 else