diff options
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index cb562a2..0397478 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -299,7 +299,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
299 | 299 | ||
300 | public string GetUserName(UUID uuid) | 300 | public string GetUserName(UUID uuid) |
301 | { | 301 | { |
302 | //m_log.DebugFormat("[XXX] GetUserName {0}", uuid); | ||
303 | string[] names = GetUserNames(uuid); | 302 | string[] names = GetUserNames(uuid); |
304 | if (names.Length == 2) | 303 | if (names.Length == 2) |
305 | { | 304 | { |
@@ -340,9 +339,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
340 | 339 | ||
341 | if (userdata.HomeURL != null && userdata.HomeURL != string.Empty) | 340 | if (userdata.HomeURL != null && userdata.HomeURL != string.Empty) |
342 | { | 341 | { |
343 | m_log.DebugFormat( | 342 | //m_log.DebugFormat( |
344 | "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}", | 343 | // "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}", |
345 | serverType, userdata.HomeURL, userID); | 344 | // serverType, userdata.HomeURL, userID); |
346 | 345 | ||
347 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL); | 346 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL); |
348 | userdata.ServerURLs = uConn.GetServerURLs(userID); | 347 | userdata.ServerURLs = uConn.GetServerURLs(userID); |
@@ -401,11 +400,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
401 | 400 | ||
402 | public void AddUser(UUID uuid, string first, string last, string homeURL) | 401 | public void AddUser(UUID uuid, string first, string last, string homeURL) |
403 | { | 402 | { |
403 | // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL); | ||
404 | |||
404 | AddUser(uuid, homeURL + ";" + first + " " + last); | 405 | AddUser(uuid, homeURL + ";" + first + " " + last); |
405 | } | 406 | } |
406 | 407 | ||
407 | public void AddUser (UUID id, string creatorData) | 408 | public void AddUser (UUID id, string creatorData) |
408 | { | 409 | { |
410 | //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData); | ||
411 | |||
409 | UserData oldUser; | 412 | UserData oldUser; |
410 | //lock the whole block - prevent concurrent update | 413 | //lock the whole block - prevent concurrent update |
411 | lock (m_UserCache) | 414 | lock (m_UserCache) |
@@ -431,9 +434,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
431 | return; | 434 | return; |
432 | } | 435 | } |
433 | } | 436 | } |
434 | // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData); | ||
435 | 437 | ||
436 | UserAccount account = m_Scenes [0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id); | 438 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id); |
437 | 439 | ||
438 | if (account != null) | 440 | if (account != null) |
439 | { | 441 | { |
@@ -482,9 +484,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
482 | lock (m_UserCache) | 484 | lock (m_UserCache) |
483 | m_UserCache[user.Id] = user; | 485 | m_UserCache[user.Id] = user; |
484 | 486 | ||
485 | // m_log.DebugFormat( | 487 | //m_log.DebugFormat( |
486 | // "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", | 488 | // "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", |
487 | // user.Id, user.FirstName, user.LastName, user.HomeURL); | 489 | // user.Id, user.FirstName, user.LastName, user.HomeURL); |
488 | } | 490 | } |
489 | 491 | ||
490 | public bool IsLocalGridUser(UUID uuid) | 492 | public bool IsLocalGridUser(UUID uuid) |