Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

1 files changed, 33 insertions, 0 deletions

diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index bef1691..bfc27b5 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -50,6 +50,14 @@ namespace OpenSim.Services.UserAccountService
 
             MainConsole.Instance.Commands.AddCommand(
                 "Users", false,
+                "show grid user",
+                "show grid user <ID>",
+                "Show grid user entry or entries that match or start with the given ID.  This will normally be a UUID.",
+                "This is for debug purposes to see what data is found for a particular user id.",
+                HandleShowGridUser);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Users", false,
                 "show grid users online",
                 "show grid users online",
                 "Show number of grid users registered as online.", 
@@ -58,6 +66,31 @@ namespace OpenSim.Services.UserAccountService
                 HandleShowGridUsersOnline);
         }
 
+        protected void HandleShowGridUser(string module, string[] cmdparams)
+        {
+            if (cmdparams.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: show grid user <UUID>");
+                return;
+            }
+
+            GridUserData[] data = m_Database.GetAll(cmdparams[3]);
+
+            foreach (GridUserData gu in data)
+            {
+                ConsoleDisplayList cdl = new ConsoleDisplayList();
+
+                cdl.AddRow("User ID", gu.UserID);
+
+                foreach (KeyValuePair<string,string> kvp in gu.Data)
+                    cdl.AddRow(kvp.Key, kvp.Value);
+
+                MainConsole.Instance.Output(cdl.ToString());
+            }
+
+            MainConsole.Instance.OutputFormat("Entries: {0}", data.Length);
+        }
+
         protected void HandleShowGridUsersOnline(string module, string[] cmdparams)
         {
 //            if (cmdparams.Length != 4)