diff options
| author | John Hurliman | 2010-01-12 10:27:21 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-01-12 10:27:21 -0800 |
| commit | a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5 (patch) | |
| tree | bf12b759e693d6b99494dfa19fb23e13488dd977 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |
| parent | Bug in llGetNumberOfPrims always returns to script when no clients are connec... (diff) | |
| parent | Add the option to reject duplicate region names (diff) | |
| download | opensim-SC_OLD-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.zip opensim-SC_OLD-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.gz opensim-SC_OLD-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.bz2 opensim-SC_OLD-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs')
| -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) |