From 434c3cf83b09fbbf4b3d20b079597a40d63bae2f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 18:15:22 +0100
Subject: Make "show name" command display HomeURL like "show names"

---
 .../Framework/UserManagement/UserManagementModule.cs      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/UserManagement')

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
                 return;
 
             string[] names;
-            if (!TryGetUserNames(userId, out names))
+
+            UserData ud;
+
+            lock (m_UserCache)
             {
-                MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
-                return;
+                if (!m_UserCache.TryGetValue(userId, out ud))
+                {
+                    MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
+                    return;
+                }
             }
 
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
             cdt.AddColumn("UUID", 36);
             cdt.AddColumn("Name", 30);
-            cdt.AddRow(userId, string.Join(" ", names));
+            cdt.AddColumn("HomeURL", 40);
+            cdt.AddRow(userId, string.Join(" ", ud.FirstName, ud.LastName), ud.HomeURL);
 
             MainConsole.Instance.Output(cdt.ToString());
         }
-- 
cgit v1.1