diff options
| author | Melanie | 2019-08-09 10:59:51 +0100 |
|---|---|---|
| committer | Melanie | 2019-08-09 10:59:51 +0100 |
| commit | 0726ef53029f3a9e4fdf4198cf75fe89dcc7c930 (patch) | |
| tree | 0be18b65fea82e42ae55871c46bd3b5d61e9f16a /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |
| parent | Make showing NPCs on the world map an option (diff) | |
| download | opensim-SC-0726ef53029f3a9e4fdf4198cf75fe89dcc7c930.zip opensim-SC-0726ef53029f3a9e4fdf4198cf75fe89dcc7c930.tar.gz opensim-SC-0726ef53029f3a9e4fdf4198cf75fe89dcc7c930.tar.bz2 opensim-SC-0726ef53029f3a9e4fdf4198cf75fe89dcc7c930.tar.xz | |
Fix #8572
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index aca3ea5..316d39d 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -208,7 +208,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 208 | m_log.Error("[CAPS]: GetDisplayNames disabled because user management component not found"); | 208 | m_log.Error("[CAPS]: GetDisplayNames disabled because user management component not found"); |
| 209 | 209 | ||
| 210 | UserAccount account = m_userAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, m_AgentID); | 210 | UserAccount account = m_userAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, m_AgentID); |
| 211 | m_scopeID = account.ScopeID; | 211 | if (account == null) // Hypergrid? |
| 212 | m_scopeID = m_Scene.RegionInfo.ScopeID; | ||
| 213 | else | ||
| 214 | m_scopeID = account.ScopeID; | ||
| 212 | 215 | ||
| 213 | RegisterHandlers(); | 216 | RegisterHandlers(); |
| 214 | 217 | ||