aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-01-30 00:42:20 +0000
committerJustin Clark-Casey (justincc)2014-01-30 00:42:20 +0000
commitc467dfcd81ad27bca30d7f665bad222a24082ce1 (patch)
tree931ebacdfd906d46cdabbe20277d313f626f7851
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentRecord whether login to home fails because no home set (UUID.Zero) or region ... (diff)
downloadopensim-SC_OLD-c467dfcd81ad27bca30d7f665bad222a24082ce1.zip
opensim-SC_OLD-c467dfcd81ad27bca30d7f665bad222a24082ce1.tar.gz
opensim-SC_OLD-c467dfcd81ad27bca30d7f665bad222a24082ce1.tar.bz2
opensim-SC_OLD-c467dfcd81ad27bca30d7f665bad222a24082ce1.tar.xz
Merge branch 'justincc-master'
-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 150c2c0..46a5c18 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -384,11 +384,30 @@ namespace OpenSim.Services.LLLoginService
384 // 384 //
385 GridRegion home = null; 385 GridRegion home = null;
386 GridUserInfo guinfo = m_GridUserService.LoggedIn(account.PrincipalID.ToString()); 386 GridUserInfo guinfo = m_GridUserService.LoggedIn(account.PrincipalID.ToString());
387 if (guinfo != null && (guinfo.HomeRegionID != UUID.Zero) && m_GridService != null) 387
388 // We are only going to complain about no home if the user actually tries to login there, to avoid
389 // spamming the console.
390 if (guinfo != null)
388 { 391 {
389 home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID); 392 if (guinfo.HomeRegionID == UUID.Zero && startLocation == "home")
393 {
394 m_log.WarnFormat(
395 "[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location but they have none set",
396 account.Name);
397 }
398 else if (m_GridService != null)
399 {
400 home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
401
402 if (home == null && startLocation == "home")
403 {
404 m_log.WarnFormat(
405 "[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location with ID {1} but this was not found.",
406 account.Name, guinfo.HomeRegionID);
407 }
408 }
390 } 409 }
391 if (guinfo == null) 410 else
392 { 411 {
393 // something went wrong, make something up, so that we don't have to test this anywhere else 412 // something went wrong, make something up, so that we don't have to test this anywhere else
394 m_log.DebugFormat("{0} Failed to fetch GridUserInfo. Creating empty GridUserInfo as home", LogHeader); 413 m_log.DebugFormat("{0} Failed to fetch GridUserInfo. Creating empty GridUserInfo as home", LogHeader);
@@ -509,10 +528,6 @@ namespace OpenSim.Services.LLLoginService
509 528
510 if (home == null) 529 if (home == null)
511 { 530 {
512 m_log.WarnFormat(
513 "[LLOGIN SERVICE]: User {0} {1} tried to login to a 'home' start location but they have none set",
514 account.FirstName, account.LastName);
515
516 tryDefaults = true; 531 tryDefaults = true;
517 } 532 }
518 else 533 else