aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-05-21 18:10:42 +0100
committerJustin Clark-Casey (justincc)2013-05-21 18:11:07 +0100
commit5c8d38d6cf00ea8e53ff52ac5eafde40ee94b68e (patch)
tree0370655765a2298f293fde0d5eac9d10eb45f2af
parentAdd "show name" console command to make it possible to show a single binding ... (diff)
downloadopensim-SC_OLD-5c8d38d6cf00ea8e53ff52ac5eafde40ee94b68e.zip
opensim-SC_OLD-5c8d38d6cf00ea8e53ff52ac5eafde40ee94b68e.tar.gz
opensim-SC_OLD-5c8d38d6cf00ea8e53ff52ac5eafde40ee94b68e.tar.bz2
opensim-SC_OLD-5c8d38d6cf00ea8e53ff52ac5eafde40ee94b68e.tar.xz
minor: Change "show names" command to use consistent console display table
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs24
1 files changed, 9 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 48ec12f..d75a85f 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -603,7 +603,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
603 603
604 ConsoleDisplayTable cdt = new ConsoleDisplayTable(); 604 ConsoleDisplayTable cdt = new ConsoleDisplayTable();
605 cdt.AddColumn("UUID", 36); 605 cdt.AddColumn("UUID", 36);
606 cdt.AddColumn("Name", 60); 606 cdt.AddColumn("Name", 30);
607 cdt.AddRow(userId, string.Join(" ", names)); 607 cdt.AddRow(userId, string.Join(" ", names));
608 608
609 MainConsole.Instance.Output(cdt.ToString()); 609 MainConsole.Instance.Output(cdt.ToString());
@@ -611,24 +611,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
611 611
612 private void HandleShowUsers(string module, string[] cmd) 612 private void HandleShowUsers(string module, string[] cmd)
613 { 613 {
614 ConsoleDisplayTable cdt = new ConsoleDisplayTable();
615 cdt.AddColumn("UUID", 36);
616 cdt.AddColumn("Name", 30);
617 cdt.AddColumn("HomeURL", 40);
618
614 lock (m_UserCache) 619 lock (m_UserCache)
615 { 620 {
616 if (m_UserCache.Count == 0)
617 {
618 MainConsole.Instance.Output("No users found");
619 return;
620 }
621
622 MainConsole.Instance.Output("UUID User Name");
623 MainConsole.Instance.Output("-----------------------------------------------------------------------------");
624 foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache) 621 foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache)
625 { 622 cdt.AddRow(kvp.Key, string.Format("{0} {1}", kvp.Value.FirstName, kvp.Value.LastName), kvp.Value.HomeURL);
626 MainConsole.Instance.Output(String.Format("{0} {1} {2} ({3})",
627 kvp.Key, kvp.Value.FirstName, kvp.Value.LastName, kvp.Value.HomeURL));
628 }
629
630 return;
631 } 623 }
624
625 MainConsole.Instance.Output(cdt.ToString());
632 } 626 }
633 } 627 }
634} \ No newline at end of file 628} \ No newline at end of file