diff options
| author | Melanie Thielker | 2017-03-31 13:47:53 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:38:41 +0100 |
| commit | c0ce746e2d2709af56cd993e3de48eb06e5b7b64 (patch) | |
| tree | 634d33d47d80fd957c6f057dc9b0e3e74bd6144f | |
| parent | Add the ability to post to and act uponconfiguration in etcd (diff) | |
| download | opensim-SC_OLD-c0ce746e2d2709af56cd993e3de48eb06e5b7b64.zip opensim-SC_OLD-c0ce746e2d2709af56cd993e3de48eb06e5b7b64.tar.gz opensim-SC_OLD-c0ce746e2d2709af56cd993e3de48eb06e5b7b64.tar.bz2 opensim-SC_OLD-c0ce746e2d2709af56cd993e3de48eb06e5b7b64.tar.xz | |
When determining if a sim can be shut down, ignore NPCs
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index e5fbc69..1ee2468 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -370,7 +370,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 370 | { | 370 | { |
| 371 | foreach (ScenePresence sp in s.GetScenePresences()) | 371 | foreach (ScenePresence sp in s.GetScenePresences()) |
| 372 | { | 372 | { |
| 373 | if (!sp.IsChildAgent) | 373 | if (!sp.IsChildAgent && !sp.IsNPC) |
| 374 | agents++; | 374 | agents++; |
| 375 | } | 375 | } |
| 376 | } | 376 | } |
| @@ -379,7 +379,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 379 | { | 379 | { |
| 380 | foreach (ScenePresence sp in rebootedScene.GetScenePresences()) | 380 | foreach (ScenePresence sp in rebootedScene.GetScenePresences()) |
| 381 | { | 381 | { |
| 382 | if (!sp.IsChildAgent) | 382 | if (!sp.IsChildAgent && !sp.IsNPC) |
| 383 | agents++; | 383 | agents++; |
| 384 | } | 384 | } |
| 385 | } | 385 | } |