diff options
author | Diva Canto | 2010-03-26 13:13:33 -0700 |
---|---|---|
committer | Diva Canto | 2010-03-26 13:13:33 -0700 |
commit | 8ee0bdb86e9dbc841a0ae5a581c18f63d06a548c (patch) | |
tree | 21ce710bda2f3b71389939139801ff4ef05effcb /OpenSim | |
parent | Select Random Region if Home or Last cant be found (diff) | |
download | opensim-SC_OLD-8ee0bdb86e9dbc841a0ae5a581c18f63d06a548c.zip opensim-SC_OLD-8ee0bdb86e9dbc841a0ae5a581c18f63d06a548c.tar.gz opensim-SC_OLD-8ee0bdb86e9dbc841a0ae5a581c18f63d06a548c.tar.bz2 opensim-SC_OLD-8ee0bdb86e9dbc841a0ae5a581c18f63d06a548c.tar.xz |
Minor improvement on debug message.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 9846364..7b25274 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -332,23 +332,22 @@ namespace OpenSim.Services.LLLoginService | |||
332 | 332 | ||
333 | if (tryDefaults) | 333 | if (tryDefaults) |
334 | { | 334 | { |
335 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(account.ScopeID); | 335 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(account.ScopeID); |
336 | if (defaults != null && defaults.Count > 0) | 336 | if (defaults != null && defaults.Count > 0) |
337 | { | 337 | { |
338 | region = defaults[0]; | 338 | region = defaults[0]; |
339 | where = "safe"; | 339 | where = "safe"; |
340 | } | 340 | } |
341 | else | 341 | else |
342 | { | 342 | { |
343 | m_log.WarnFormat("[LLOGIN SERVICE]: User {0} {1} does not have a valid home and this grid does not have default locations.", | 343 | m_log.WarnFormat("[LLOGIN SERVICE]: User {0} {1} does not have a valid home and this grid does not have default locations. Attempting to find random region", |
344 | account.FirstName, account.LastName); | 344 | account.FirstName, account.LastName); |
345 | m_log.Info("[LLOGIN SERVICE]: Home Region Not Found Attempting to find random region"); | 345 | defaults = m_GridService.GetRegionsByName(account.ScopeID, "", 1); |
346 | defaults = m_GridService.GetRegionsByName(account.ScopeID, "", 1); | 346 | if (defaults != null && defaults.Count > 0) |
347 | if (defaults != null && defaults.Count > 0) | 347 | { |
348 | { | 348 | region = defaults[0]; |
349 | region = defaults[0]; | 349 | where = "safe"; |
350 | where = "safe"; | 350 | } |
351 | } | ||
352 | } | 351 | } |
353 | } | 352 | } |
354 | 353 | ||
@@ -371,16 +370,16 @@ namespace OpenSim.Services.LLLoginService | |||
371 | { | 370 | { |
372 | region = defaults[0]; | 371 | region = defaults[0]; |
373 | where = "safe"; | 372 | where = "safe"; |
374 | } | 373 | } |
375 | else | 374 | else |
376 | { | 375 | { |
377 | m_log.Info("[LLOGIN SERVICE]: Last Region Not Found Attempting to find random region"); | 376 | m_log.Info("[LLOGIN SERVICE]: Last Region Not Found Attempting to find random region"); |
378 | defaults = m_GridService.GetRegionsByName(account.ScopeID, "", 1); | 377 | defaults = m_GridService.GetRegionsByName(account.ScopeID, "", 1); |
379 | if (defaults != null && defaults.Count > 0) | 378 | if (defaults != null && defaults.Count > 0) |
380 | { | 379 | { |
381 | region = defaults[0]; | 380 | region = defaults[0]; |
382 | where = "safe"; | 381 | where = "safe"; |
383 | } | 382 | } |
384 | } | 383 | } |
385 | 384 | ||
386 | } | 385 | } |
@@ -393,7 +392,7 @@ namespace OpenSim.Services.LLLoginService | |||
393 | return region; | 392 | return region; |
394 | } | 393 | } |
395 | else | 394 | else |
396 | { | 395 | { |
397 | // free uri form | 396 | // free uri form |
398 | // e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34 | 397 | // e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34 |
399 | where = "url"; | 398 | where = "url"; |
@@ -414,7 +413,7 @@ namespace OpenSim.Services.LLLoginService | |||
414 | if (regionName != null) | 413 | if (regionName != null) |
415 | { | 414 | { |
416 | if (!regionName.Contains("@")) | 415 | if (!regionName.Contains("@")) |
417 | { | 416 | { |
418 | List<GridRegion> regions = m_GridService.GetRegionsByName(account.ScopeID, regionName, 1); | 417 | List<GridRegion> regions = m_GridService.GetRegionsByName(account.ScopeID, regionName, 1); |
419 | if ((regions == null) || (regions != null && regions.Count == 0)) | 418 | if ((regions == null) || (regions != null && regions.Count == 0)) |
420 | { | 419 | { |
@@ -434,7 +433,7 @@ namespace OpenSim.Services.LLLoginService | |||
434 | return regions[0]; | 433 | return regions[0]; |
435 | } | 434 | } |
436 | else | 435 | else |
437 | { | 436 | { |
438 | if (m_UserAgentService == null) | 437 | if (m_UserAgentService == null) |
439 | { | 438 | { |
440 | m_log.WarnFormat("[LLLOGIN SERVICE]: This llogin service is not running a user agent service, as such it can't lauch agents at foreign grids"); | 439 | m_log.WarnFormat("[LLLOGIN SERVICE]: This llogin service is not running a user agent service, as such it can't lauch agents at foreign grids"); |
@@ -446,7 +445,7 @@ namespace OpenSim.Services.LLLoginService | |||
446 | m_log.InfoFormat("[LLLOGIN SERVICE]: Got Custom Login URI {0}, can't locate region {1}", startLocation, regionName); | 445 | m_log.InfoFormat("[LLLOGIN SERVICE]: Got Custom Login URI {0}, can't locate region {1}", startLocation, regionName); |
447 | return null; | 446 | return null; |
448 | } | 447 | } |
449 | // Valid specification of a remote grid | 448 | // Valid specification of a remote grid |
450 | 449 | ||
451 | regionName = parts[0]; | 450 | regionName = parts[0]; |
452 | string domainLocator = parts[1]; | 451 | string domainLocator = parts[1]; |