From a6ecedb72a44dbf9c2b9ec4c8f51ec70fce06b78 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 31 Mar 2017 13:50:28 +0100
Subject: [PATCH] Also ignore NPCs in short-circuiting region restarts

---
 OpenSim/Region/CoreModules/World/Region/RestartModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index bf6592fd1a..bb3b8605b5 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -374,7 +374,7 @@ namespace OpenSim.Region.CoreModules.World.Region
                 {
                     foreach (ScenePresence sp in s.GetScenePresences())
                     {
-                        if (!sp.IsChildAgent)
+                        if (!sp.IsChildAgent && !sp.IsNPC)
                             agents++;
                     }
                 }
@@ -383,7 +383,7 @@ namespace OpenSim.Region.CoreModules.World.Region
             {
                 foreach (ScenePresence sp in m_Scene.GetScenePresences())
                 {
-                    if (!sp.IsChildAgent)
+                    if (!sp.IsChildAgent && !sp.IsNPC)
                         agents++;
                 }
             }