diff options
| author | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
| commit | 5587ee45005bd99ee01cefd8fb3ae3f2b91bf284 (patch) | |
| tree | 2863324dc4f7832d60c22118268b8a432fb7c1bf /OpenSim/Region/CoreModules/Framework | |
| parent | add CanSellObject() permitions check functions (diff) | |
| parent | If a DNS resolution fails on an outbound request, simply allow it (diff) | |
| download | opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.zip opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.gz opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.bz2 opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.xz | |
Merge branch 'melanie'
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 51f973a..32cb5a3 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
| @@ -957,9 +957,14 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
| 957 | 957 | ||
| 958 | public virtual bool IsLocalGridUser(UUID uuid) | 958 | public virtual bool IsLocalGridUser(UUID uuid) |
| 959 | { | 959 | { |
| 960 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid); | 960 | lock (m_Scenes) |
| 961 | if (account == null || (account != null && !account.LocalToGrid)) | 961 | { |
| 962 | return false; | 962 | if (m_Scenes.Count == 0) |
| 963 | return true; | ||
| 964 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid); | ||
| 965 | if (account == null || (account != null && !account.LocalToGrid)) | ||
| 966 | return false; | ||
| 967 | } | ||
| 963 | 968 | ||
| 964 | return true; | 969 | return true; |
| 965 | } | 970 | } |