diff options
author | Diva Canto | 2010-12-05 19:43:24 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-05 19:43:24 -0800 |
commit | 72748746d53df1c033207452a4315d93bc780158 (patch) | |
tree | e50bf963b16737946c0717ee42779b2aa5e3ff8d /OpenSim/Services/HypergridService/UserAgentService.cs | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
download | opensim-SC-72748746d53df1c033207452a4315d93bc780158.zip opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.gz opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.bz2 opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.xz |
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 32b4249..3519250 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -101,6 +101,8 @@ namespace OpenSim.Services.HypergridService | |||
101 | serverConfig = config.Configs["GatekeeperService"]; | 101 | serverConfig = config.Configs["GatekeeperService"]; |
102 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); | 102 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); |
103 | } | 103 | } |
104 | else if (!m_GridName.EndsWith("/")) | ||
105 | m_GridName = m_GridName + "/"; | ||
104 | } | 106 | } |
105 | } | 107 | } |
106 | 108 | ||
@@ -152,8 +154,8 @@ namespace OpenSim.Services.HypergridService | |||
152 | bool success = false; | 154 | bool success = false; |
153 | string myExternalIP = string.Empty; | 155 | string myExternalIP = string.Empty; |
154 | string gridName = gatekeeper.ServerURI; | 156 | string gridName = gatekeeper.ServerURI; |
155 | 157 | ||
156 | m_log.Debug("m_grid - " + m_GridName + ", gn - " + gridName); | 158 | m_log.DebugFormat("[USER AGENT SERVICE]: m_grid - {0}, gn - {1}", m_GridName, gridName); |
157 | 159 | ||
158 | if (m_GridName == gridName) | 160 | if (m_GridName == gridName) |
159 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); | 161 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); |