diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index aca3ea569b..316d39d875 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 m_log.Error("[CAPS]: GetDisplayNames disabled because user management component not found"); UserAccount account = m_userAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, m_AgentID); - m_scopeID = account.ScopeID; + if (account == null) // Hypergrid? + m_scopeID = m_Scene.RegionInfo.ScopeID; + else + m_scopeID = account.ScopeID; RegisterHandlers();