diff options
| author | Melanie Thielker | 2017-03-31 13:51:42 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:38:42 +0100 |
| commit | 59f7cf79c9925ea07a79d975bf480aba7b5d6498 (patch) | |
| tree | 43bf51135b204ac88e9569a7568323167998bf81 /OpenSim/Region/CoreModules/Framework | |
| parent | Add missing dependency for etcd moduile (diff) | |
| download | opensim-SC_OLD-59f7cf79c9925ea07a79d975bf480aba7b5d6498.zip opensim-SC_OLD-59f7cf79c9925ea07a79d975bf480aba7b5d6498.tar.gz opensim-SC_OLD-59f7cf79c9925ea07a79d975bf480aba7b5d6498.tar.bz2 opensim-SC_OLD-59f7cf79c9925ea07a79d975bf480aba7b5d6498.tar.xz | |
Prevent error spew when script send IM to HG users before HG is up
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 | } |