minor: Change "show names" command to use consistent console display table

user_profiles
Justin Clark-Casey (justincc) 2013-05-21 18:10:42 +01:00
parent 6edecd5d94
commit 5c8d38d6cf
1 changed files with 9 additions and 15 deletions

View File

@ -603,7 +603,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
ConsoleDisplayTable cdt = new ConsoleDisplayTable(); ConsoleDisplayTable cdt = new ConsoleDisplayTable();
cdt.AddColumn("UUID", 36); cdt.AddColumn("UUID", 36);
cdt.AddColumn("Name", 60); cdt.AddColumn("Name", 30);
cdt.AddRow(userId, string.Join(" ", names)); cdt.AddRow(userId, string.Join(" ", names));
MainConsole.Instance.Output(cdt.ToString()); MainConsole.Instance.Output(cdt.ToString());
@ -611,24 +611,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
private void HandleShowUsers(string module, string[] cmd) private void HandleShowUsers(string module, string[] cmd)
{ {
ConsoleDisplayTable cdt = new ConsoleDisplayTable();
cdt.AddColumn("UUID", 36);
cdt.AddColumn("Name", 30);
cdt.AddColumn("HomeURL", 40);
lock (m_UserCache) lock (m_UserCache)
{ {
if (m_UserCache.Count == 0)
{
MainConsole.Instance.Output("No users found");
return;
}
MainConsole.Instance.Output("UUID User Name");
MainConsole.Instance.Output("-----------------------------------------------------------------------------");
foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache) foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache)
{ cdt.AddRow(kvp.Key, string.Format("{0} {1}", kvp.Value.FirstName, kvp.Value.LastName), kvp.Value.HomeURL);
MainConsole.Instance.Output(String.Format("{0} {1} {2} ({3})",
kvp.Key, kvp.Value.FirstName, kvp.Value.LastName, kvp.Value.HomeURL));
} }
return; MainConsole.Instance.Output(cdt.ToString());
}
} }
} }
} }