aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-07 05:29:12 +0000
committerJustin Clarke Casey2008-09-07 05:29:12 +0000
commit108f3b89f59837ec89df4cb6d2ca5c24b574a773 (patch)
treed28d6ea65fe740942fa920dac0449259f02cc2d1 /OpenSim/Grid
parent* Increase expect_user XMLRPC timeout from 6 to 30 seconds (diff)
downloadopensim-SC_OLD-108f3b89f59837ec89df4cb6d2ca5c24b574a773.zip
opensim-SC_OLD-108f3b89f59837ec89df4cb6d2ca5c24b574a773.tar.gz
opensim-SC_OLD-108f3b89f59837ec89df4cb6d2ca5c24b574a773.tar.bz2
opensim-SC_OLD-108f3b89f59837ec89df4cb6d2ca5c24b574a773.tar.xz
* On a failing login, don't bother trying the default region if it's the same as the original login region
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index da41dfd..f22e084 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -241,13 +241,17 @@ namespace OpenSim.Grid.UserServer
241 // Send him to default region instead 241 // Send him to default region instead
242 // Load information from the gridserver 242 // Load information from the gridserver
243 ulong defaultHandle = (((ulong) m_config.DefaultX * Constants.RegionSize) << 32) | 243 ulong defaultHandle = (((ulong) m_config.DefaultX * Constants.RegionSize) << 32) |
244 ((ulong) m_config.DefaultY * Constants.RegionSize); 244 ((ulong) m_config.DefaultY * Constants.RegionSize);
245
246 if (defaultHandle == SimInfo.regionHandle)
247 {
248 m_log.ErrorFormat("[LOGIN]: Not trying the default region since this is the same as the selected region");
249 return false;
250 }
245 251
246 m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead"); 252 m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead");
247 253
248 SimInfo = RegionProfileData.RequestSimProfileData( 254 SimInfo = RegionProfileData.RequestSimProfileData(defaultHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
249 defaultHandle, m_config.GridServerURL,
250 m_config.GridSendKey, m_config.GridRecvKey);
251 255
252 // Customise the response 256 // Customise the response
253 response.Home = 257 response.Home =