aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-23 00:18:19 -0400
committerJonathan Freedman2010-10-23 00:18:19 -0400
commit5ddb8b535e33ea6fbe668bad76c25f501f154bae (patch)
tree8830636140fe92eccd599cbae73c4dcf75a397a5 /OpenSim/Services/LLLoginService
parentMerge branch 'hg16' into mantis5110 (diff)
downloadopensim-SC_OLD-5ddb8b535e33ea6fbe668bad76c25f501f154bae.zip
opensim-SC_OLD-5ddb8b535e33ea6fbe668bad76c25f501f154bae.tar.gz
opensim-SC_OLD-5ddb8b535e33ea6fbe668bad76c25f501f154bae.tar.bz2
opensim-SC_OLD-5ddb8b535e33ea6fbe668bad76c25f501f154bae.tar.xz
* a bit of additional debugging:
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 127c4b2..b0b51c4 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -566,6 +566,7 @@ namespace OpenSim.Services.LLLoginService
566 566
567 private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper) 567 private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper)
568 { 568 {
569 m_log.Debug("attempting to findforeignregion " + domainName + ":" + port.ToString() + ":" + regionName);
569 gatekeeper = new GridRegion(); 570 gatekeeper = new GridRegion();
570 gatekeeper.ExternalHostName = domainName; 571 gatekeeper.ExternalHostName = domainName;
571 gatekeeper.HttpPort = port; 572 gatekeeper.HttpPort = port;
@@ -631,11 +632,9 @@ namespace OpenSim.Services.LLLoginService
631 gatekeeper = new GridRegion(destination); 632 gatekeeper = new GridRegion(destination);
632 gatekeeper.ExternalHostName = hostName; 633 gatekeeper.ExternalHostName = hostName;
633 gatekeeper.HttpPort = (uint)port; 634 gatekeeper.HttpPort = (uint)port;
634 635 gatekeeper.ServerURI = m_GatekeeperURL;
635 }
636 else // login to foreign grid
637 {
638 } 636 }
637 m_log.Debug("no gatekeeper detected..... using " + m_GatekeeperURL);
639 } 638 }
640 639
641 bool success = false; 640 bool success = false;