diff options
author | onefang | 2021-07-07 09:02:55 +1000 |
---|---|---|
committer | onefang | 2021-07-07 09:02:55 +1000 |
commit | 19f90f7b2e8622a1fe6dfe00a2ebb1c951b0c411 (patch) | |
tree | 75cc6fe3a1d6ad8d7ea01847dba2188b4d64d8ac /OpenSim/Region | |
parent | Lots of SledjChisl changes. (diff) | |
download | opensim-SC-19f90f7b2e8622a1fe6dfe00a2ebb1c951b0c411.zip opensim-SC-19f90f7b2e8622a1fe6dfe00a2ebb1c951b0c411.tar.gz opensim-SC-19f90f7b2e8622a1fe6dfe00a2ebb1c951b0c411.tar.bz2 opensim-SC-19f90f7b2e8622a1fe6dfe00a2ebb1c951b0c411.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 11 |
1 files changed, 7 insertions, 4 deletions
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 | |||
936 | MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count)); | 936 | MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count)); |
937 | 937 | ||
938 | MainConsole.Instance.Output( | 938 | MainConsole.Instance.Output( |
939 | String.Format("{0,-16} {1,-16} {2,-37} {3,-11} {4,-16} {5,-30}", "Firstname", "Lastname", | 939 | String.Format("{0,-16} {1,-16} {2,-37} {3,-14} {4,-32} {5,-30}", "Firstname", "Lastname", |
940 | "Agent ID", "Root/Child", "Region", "Position") | 940 | "Agent ID", "child/NPC/root", "Region", "Position") |
941 | ); | 941 | ); |
942 | 942 | ||
943 | foreach (ScenePresence presence in agents) | 943 | foreach (ScenePresence presence in agents) |
944 | { | 944 | { |
945 | RegionInfo regionInfo = presence.Scene.RegionInfo; | 945 | RegionInfo regionInfo = presence.Scene.RegionInfo; |
946 | string regionName; | 946 | string regionName; |
947 | string type = presence.IsChildAgent ? "child" : "root"; | ||
947 | 948 | ||
949 | if (presence.IsNPC) | ||
950 | type = "NPC"; | ||
948 | if (regionInfo == null) | 951 | if (regionInfo == null) |
949 | { | 952 | { |
950 | regionName = "Unresolvable"; | 953 | regionName = "Unresolvable"; |
@@ -955,11 +958,11 @@ namespace OpenSim | |||
955 | 958 | ||
956 | MainConsole.Instance.Output( | 959 | MainConsole.Instance.Output( |
957 | String.Format( | 960 | String.Format( |
958 | "{0,-16} {1,-16} {2,-37} {3,-11} {4,-16} {5,-30}", | 961 | "{0,-16} {1,-16} {2,-37} {3,-14} {4,-32} {5,-30}", |
959 | presence.Firstname, | 962 | presence.Firstname, |
960 | presence.Lastname, | 963 | presence.Lastname, |
961 | presence.UUID, | 964 | presence.UUID, |
962 | presence.IsChildAgent ? "Child" : "Root", | 965 | type, |
963 | regionName, | 966 | regionName, |
964 | presence.AbsolutePosition.ToString()) | 967 | presence.AbsolutePosition.ToString()) |
965 | ); | 968 | ); |