diff options
| author | Melanie | 2010-01-10 04:16:06 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-10 04:16:06 +0000 |
| commit | 1676e70dfe322381495b08ac1187ae9685f94e69 (patch) | |
| tree | b0b949af491811972dd866bff09f037e335c2b2b /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix a small bug in login disable code (diff) | |
| download | opensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.zip opensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.tar.gz opensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.tar.bz2 opensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 93cb60c..f9cd90f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
| @@ -696,8 +696,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
| 696 | public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome) | 696 | public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome) |
| 697 | { | 697 | { |
| 698 | comingHome = false; | 698 | comingHome = false; |
| 699 | if (!m_aScene.SceneGridService.RegionLoginsEnabled) | ||
| 700 | return false; | ||
| 701 | 699 | ||
| 702 | CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID); | 700 | CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID); |
| 703 | if (uinfo != null) | 701 | if (uinfo != null) |