diff options
author | Justin Clark-Casey (justincc) | 2013-05-21 18:15:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-21 18:15:22 +0100 |
commit | 434c3cf83b09fbbf4b3d20b079597a40d63bae2f (patch) | |
tree | 0f702dc170ac58bb9df176020938b69158f55082 /OpenSim/Region/CoreModules/Framework | |
parent | minor: Change "show names" command to use consistent console display table (diff) | |
download | opensim-SC_OLD-434c3cf83b09fbbf4b3d20b079597a40d63bae2f.zip opensim-SC_OLD-434c3cf83b09fbbf4b3d20b079597a40d63bae2f.tar.gz opensim-SC_OLD-434c3cf83b09fbbf4b3d20b079597a40d63bae2f.tar.bz2 opensim-SC_OLD-434c3cf83b09fbbf4b3d20b079597a40d63bae2f.tar.xz |
Make "show name" command display HomeURL like "show names"
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index d75a85f..f8f4235 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -595,16 +595,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
595 | return; | 595 | return; |
596 | 596 | ||
597 | string[] names; | 597 | string[] names; |
598 | if (!TryGetUserNames(userId, out names)) | 598 | |
599 | UserData ud; | ||
600 | |||
601 | lock (m_UserCache) | ||
599 | { | 602 | { |
600 | MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId); | 603 | if (!m_UserCache.TryGetValue(userId, out ud)) |
601 | return; | 604 | { |
605 | MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId); | ||
606 | return; | ||
607 | } | ||
602 | } | 608 | } |
603 | 609 | ||
604 | ConsoleDisplayTable cdt = new ConsoleDisplayTable(); | 610 | ConsoleDisplayTable cdt = new ConsoleDisplayTable(); |
605 | cdt.AddColumn("UUID", 36); | 611 | cdt.AddColumn("UUID", 36); |
606 | cdt.AddColumn("Name", 30); | 612 | cdt.AddColumn("Name", 30); |
607 | cdt.AddRow(userId, string.Join(" ", names)); | 613 | cdt.AddColumn("HomeURL", 40); |
614 | cdt.AddRow(userId, string.Join(" ", ud.FirstName, ud.LastName), ud.HomeURL); | ||
608 | 615 | ||
609 | MainConsole.Instance.Output(cdt.ToString()); | 616 | MainConsole.Instance.Output(cdt.ToString()); |
610 | } | 617 | } |