* On a failing login, don't bother trying the default region if it's the same as the original login region

0.6.0-stable
Justin Clarke Casey 2008-09-07 05:29:12 +00:00
parent 42661a8a97
commit 108f3b89f5
1 changed files with 8 additions and 4 deletions

View File

@ -241,13 +241,17 @@ namespace OpenSim.Grid.UserServer
// Send him to default region instead // Send him to default region instead
// Load information from the gridserver // Load information from the gridserver
ulong defaultHandle = (((ulong) m_config.DefaultX * Constants.RegionSize) << 32) | ulong defaultHandle = (((ulong) m_config.DefaultX * Constants.RegionSize) << 32) |
((ulong) m_config.DefaultY * Constants.RegionSize); ((ulong) m_config.DefaultY * Constants.RegionSize);
if (defaultHandle == SimInfo.regionHandle)
{
m_log.ErrorFormat("[LOGIN]: Not trying the default region since this is the same as the selected region");
return false;
}
m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead"); m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead");
SimInfo = RegionProfileData.RequestSimProfileData( SimInfo = RegionProfileData.RequestSimProfileData(defaultHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
defaultHandle, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
// Customise the response // Customise the response
response.Home = response.Home =