2 files changed, 12 insertions, 3 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
                 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();
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 15294c3..ad1c473 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -95,6 +95,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private bool m_exportPrintScale = false; // prints the scale of map in meters on exported map
         private bool m_exportPrintRegionName = false; // prints the region name exported map
+        private bool m_showNPCs = true;
 
         #region INonSharedRegionModule Members
         public virtual void Initialise(IConfigSource config)
@@ -111,6 +112,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 Util.GetConfigVarFromSections<bool>(config, "ExportMapAddScale", configSections, m_exportPrintScale);
             m_exportPrintRegionName =
                 Util.GetConfigVarFromSections<bool>(config, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
+            m_showNPCs =
+                Util.GetConfigVarFromSections<bool>(config, "ShowNPCs", configSections, m_showNPCs);
         }
 
         public virtual void AddRegion(Scene scene)
@@ -501,9 +504,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         {
                             m_scene.ForEachRootScenePresence(delegate (ScenePresence sp)
                             {
-                            // Don't send a green dot for yourself
-                            if (sp.UUID != remoteClient.AgentId)
+                                // Don't send a green dot for yourself
+                                if (sp.UUID != remoteClient.AgentId)
                                 {
+                                    if (sp.PresenceType == PresenceType.Npc && !m_showNPCs)
+                                        return;
+
                                     mapitem = new mapItemReply(
                                         xstart + (uint)sp.AbsolutePosition.X,
                                         ystart + (uint)sp.AbsolutePosition.Y,