diff options
author | Justin Clarke Casey | 2009-05-04 19:15:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-04 19:15:44 +0000 |
commit | b3178c8079a4f8c0fe57af2fc9040d0667298ef0 (patch) | |
tree | 1a4137f014c70f6f25b7a2ffcd11927966b3a9f3 /OpenSim/Framework/Communications/UserManagerBase.cs | |
parent | * Initial infrastructure for ospa only uuid hashing of retrieved inventory items (diff) | |
download | opensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.zip opensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.tar.gz opensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.tar.bz2 opensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.tar.xz |
* Resolve http://opensimulator.org/mantis/view.php?id=3573
* Override add user for HG user services to hit local services if present
Diffstat (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 133f810..50f57e1 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -623,7 +623,7 @@ namespace OpenSim.Framework.Communications | |||
623 | /// <param name="regX">location X</param> | 623 | /// <param name="regX">location X</param> |
624 | /// <param name="regY">location Y</param> | 624 | /// <param name="regY">location Y</param> |
625 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> | 625 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> |
626 | public UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY) | 626 | public virtual UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY) |
627 | { | 627 | { |
628 | return AddUser(firstName, lastName, password, email, regX, regY, UUID.Random()); | 628 | return AddUser(firstName, lastName, password, email, regX, regY, UUID.Random()); |
629 | } | 629 | } |
@@ -639,7 +639,7 @@ namespace OpenSim.Framework.Communications | |||
639 | /// <param name="regY">location Y</param> | 639 | /// <param name="regY">location Y</param> |
640 | /// <param name="SetUUID">UUID of avatar.</param> | 640 | /// <param name="SetUUID">UUID of avatar.</param> |
641 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> | 641 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> |
642 | public UUID AddUser( | 642 | public virtual UUID AddUser( |
643 | string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID) | 643 | string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID) |
644 | { | 644 | { |
645 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); | 645 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); |