diff options
| author | Melanie Thielker | 2017-03-31 13:50:28 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:38:42 +0100 |
| commit | a6ecedb72a44dbf9c2b9ec4c8f51ec70fce06b78 (patch) | |
| tree | b14cafdcb196d625145bdb0a9bd948ae4c283872 /OpenSim | |
| parent | When determining if a sim can be shut down, ignore NPCs (diff) | |
| download | opensim-SC-a6ecedb72a44dbf9c2b9ec4c8f51ec70fce06b78.zip opensim-SC-a6ecedb72a44dbf9c2b9ec4c8f51ec70fce06b78.tar.gz opensim-SC-a6ecedb72a44dbf9c2b9ec4c8f51ec70fce06b78.tar.bz2 opensim-SC-a6ecedb72a44dbf9c2b9ec4c8f51ec70fce06b78.tar.xz | |
Also ignore NPCs in short-circuiting region restarts
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Region/RestartModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs index bf6592f..bb3b860 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 | |||
| 374 | { | 374 | { |
| 375 | foreach (ScenePresence sp in s.GetScenePresences()) | 375 | foreach (ScenePresence sp in s.GetScenePresences()) |
| 376 | { | 376 | { |
| 377 | if (!sp.IsChildAgent) | 377 | if (!sp.IsChildAgent && !sp.IsNPC) |
| 378 | agents++; | 378 | agents++; |
| 379 | } | 379 | } |
| 380 | } | 380 | } |
| @@ -383,7 +383,7 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
| 383 | { | 383 | { |
| 384 | foreach (ScenePresence sp in m_Scene.GetScenePresences()) | 384 | foreach (ScenePresence sp in m_Scene.GetScenePresences()) |
| 385 | { | 385 | { |
| 386 | if (!sp.IsChildAgent) | 386 | if (!sp.IsChildAgent && !sp.IsNPC) |
| 387 | agents++; | 387 | agents++; |
| 388 | } | 388 | } |
| 389 | } | 389 | } |