diff options
author | Diva Canto | 2012-01-12 10:22:52 -0800 |
---|---|---|
committer | Diva Canto | 2012-01-12 10:22:52 -0800 |
commit | cadd645076eacd6bd0b70a665ed3f5157cd6e5d3 (patch) | |
tree | 6ee20b3f526ee6f1ce48371e9b89d1ef716015a8 /OpenSim/Region/CoreModules/Framework | |
parent | Allow update of stored entries within User Management Module-this is needed f... (diff) | |
download | opensim-SC_OLD-cadd645076eacd6bd0b70a665ed3f5157cd6e5d3.zip opensim-SC_OLD-cadd645076eacd6bd0b70a665ed3f5157cd6e5d3.tar.gz opensim-SC_OLD-cadd645076eacd6bd0b70a665ed3f5157cd6e5d3.tar.bz2 opensim-SC_OLD-cadd645076eacd6bd0b70a665ed3f5157cd6e5d3.tar.xz |
Renamed one var and deleted commented code. No functional changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 2ad30a0..80ab30c 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -413,14 +413,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
413 | user.Id = uuid; | 413 | user.Id = uuid; |
414 | user.FirstName = first; | 414 | user.FirstName = first; |
415 | user.LastName = last; | 415 | user.LastName = last; |
416 | // user.ProfileURL = we should initialize this to the default | ||
417 | 416 | ||
418 | AddUserInternal(user); | 417 | AddUserInternal(user); |
419 | } | 418 | } |
420 | 419 | ||
421 | public void AddUser(UUID uuid, string first, string last, string profileURL) | 420 | public void AddUser(UUID uuid, string first, string last, string homeURL) |
422 | { | 421 | { |
423 | AddUser(uuid, profileURL + ";" + first + " " + last); | 422 | AddUser(uuid, homeURL + ";" + first + " " + last); |
424 | } | 423 | } |
425 | 424 | ||
426 | public void AddUser (UUID id, string creatorData) | 425 | public void AddUser (UUID id, string creatorData) |
@@ -492,36 +491,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
492 | // user.Id, user.FirstName, user.LastName, user.HomeURL); | 491 | // user.Id, user.FirstName, user.LastName, user.HomeURL); |
493 | } | 492 | } |
494 | 493 | ||
495 | //public void AddUser(UUID uuid, string userData) | ||
496 | //{ | ||
497 | // if (m_UserCache.ContainsKey(uuid)) | ||
498 | // return; | ||
499 | |||
500 | // UserData user = new UserData(); | ||
501 | // user.Id = uuid; | ||
502 | |||
503 | // // userData = <profile url>;<name> | ||
504 | // string[] parts = userData.Split(';'); | ||
505 | // if (parts.Length >= 1) | ||
506 | // user.ProfileURL = parts[0].Trim(); | ||
507 | // if (parts.Length >= 2) | ||
508 | // { | ||
509 | // string[] name = parts[1].Trim().Split(' '); | ||
510 | // if (name.Length >= 1) | ||
511 | // user.FirstName = name[0]; | ||
512 | // if (name.Length >= 2) | ||
513 | // user.LastName = name[1]; | ||
514 | // else | ||
515 | // user.LastName = "?"; | ||
516 | // } | ||
517 | |||
518 | // lock (m_UserCache) | ||
519 | // m_UserCache.Add(uuid, user); | ||
520 | |||
521 | // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", user.Id, user.FirstName, user.LastName, user.ProfileURL); | ||
522 | |||
523 | //} | ||
524 | |||
525 | public bool IsLocalGridUser(UUID uuid) | 494 | public bool IsLocalGridUser(UUID uuid) |
526 | { | 495 | { |
527 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid); | 496 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid); |