From 19f90f7b2e8622a1fe6dfe00a2ebb1c951b0c411 Mon Sep 17 00:00:00 2001
From: onefang
Date: Wed, 7 Jul 2021 09:02:55 +1000
Subject: For "show users" show if they are an NPC or not.

Note that long ago OpenSim broke showing child avatars, and I don't
care.
---
 OpenSim/Region/Application/OpenSim.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 786a41c..8e3f909 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -936,15 +936,18 @@ namespace OpenSim
                     MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
 
                     MainConsole.Instance.Output(
-                        String.Format("{0,-16} {1,-16} {2,-37} {3,-11} {4,-16} {5,-30}", "Firstname", "Lastname",
-                                      "Agent ID", "Root/Child", "Region", "Position")
+                        String.Format("{0,-16} {1,-16} {2,-37} {3,-14} {4,-32} {5,-30}", "Firstname", "Lastname",
+                                      "Agent ID", "child/NPC/root", "Region", "Position")
                     );
 
                     foreach (ScenePresence presence in agents)
                     {
                         RegionInfo regionInfo = presence.Scene.RegionInfo;
                         string regionName;
+                        string type = presence.IsChildAgent ? "child" : "root";
 
+			if (presence.IsNPC)
+			    type = "NPC";
                         if (regionInfo == null)
                         {
                             regionName = "Unresolvable";
@@ -955,11 +958,11 @@ namespace OpenSim
 
                         MainConsole.Instance.Output(
                             String.Format(
-                                "{0,-16} {1,-16} {2,-37} {3,-11} {4,-16} {5,-30}",
+                                "{0,-16} {1,-16} {2,-37} {3,-14} {4,-32} {5,-30}",
                                 presence.Firstname,
                                 presence.Lastname,
                                 presence.UUID,
-                                presence.IsChildAgent ? "Child" : "Root",
+                                type,
                                 regionName,
                                 presence.AbsolutePosition.ToString())
                         );
-- 
cgit v1.1