aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs7
-rw-r--r--OpenSim/Services/UserAccountService/GridUserService.cs6
2 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a1343fb..ff31b67 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -323,6 +323,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
323 GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString()); 323 GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
324 if (uInfo != null) 324 if (uInfo != null)
325 { 325 {
326 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Found grid user {0}", uInfo.UserID);
326 string url, first, last, tmp; 327 string url, first, last, tmp;
327 UUID u; 328 UUID u;
328 if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp)) 329 if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp))
@@ -334,10 +335,14 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
334 335
335 return true; 336 return true;
336 } 337 }
338 else
339 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI");
337 } 340 }
341 else
342 m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found");
338 343
339 names[0] = "Unknown"; 344 names[0] = "Unknown";
340 names[1] = "UserUMMTGUN5"; 345 names[1] = "UserUMMTGUN6";
341 346
342 return false; 347 return false;
343 } 348 }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 62b82fe..af2701d 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Services.UserAccountService
46 46
47 public GridUserService(IConfigSource config) : base(config) 47 public GridUserService(IConfigSource config) : base(config)
48 { 48 {
49 m_log.Debug("[USER GRID SERVICE]: Starting user grid service"); 49 m_log.Debug("[GRID USER SERVICE]: Starting user grid service");
50 } 50 }
51 51
52 public virtual GridUserInfo GetGridUserInfo(string userID) 52 public virtual GridUserInfo GetGridUserInfo(string userID)
@@ -58,13 +58,17 @@ namespace OpenSim.Services.UserAccountService
58 { 58 {
59 GridUserData[] ds = m_Database.GetAll(userID); 59 GridUserData[] ds = m_Database.GetAll(userID);
60 if (ds == null) 60 if (ds == null)
61 {
62 m_log.DebugFormat("[GRID USER SERVICE]: user not found {0}", userID);
61 return null; 63 return null;
64 }
62 if (ds.Length > 0) 65 if (ds.Length > 0)
63 { 66 {
64 d = ds[0]; 67 d = ds[0];
65 foreach (GridUserData dd in ds) 68 foreach (GridUserData dd in ds)
66 if (dd.UserID.Length > d.UserID.Length) // find the longest 69 if (dd.UserID.Length > d.UserID.Length) // find the longest
67 d = dd; 70 d = dd;
71 m_log.DebugFormat("[GRID USER SERVICE]: Found user {0}", d.UserID);
68 } 72 }
69 } 73 }
70 74