diff options
Diffstat (limited to 'OpenSim/Framework/Communications/CommunicationsManager.cs')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index bb4a853..3f46776 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -255,14 +255,15 @@ namespace OpenSim.Framework.Communications | |||
255 | /// <param name="firstName"></param> | 255 | /// <param name="firstName"></param> |
256 | /// <param name="lastName"></param> | 256 | /// <param name="lastName"></param> |
257 | /// <param name="password"></param> | 257 | /// <param name="password"></param> |
258 | /// <param name="email"></param> | ||
258 | /// <param name="regX"></param> | 259 | /// <param name="regX"></param> |
259 | /// <param name="regY"></param> | 260 | /// <param name="regY"></param> |
260 | /// <returns>The UUID of the added user. Returns UUID.Zero if the add was unsuccessful</returns> | 261 | /// <returns>The UUID of the added user. Returns UUID.Zero if the add was unsuccessful</returns> |
261 | public UUID AddUser(string firstName, string lastName, string password, uint regX, uint regY) | 262 | public UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY) |
262 | { | 263 | { |
263 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); | 264 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); |
264 | 265 | ||
265 | m_userServiceAdmin.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY); | 266 | m_userServiceAdmin.AddUserProfile(firstName, lastName, md5PasswdHash, email, regX, regY); |
266 | UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); | 267 | UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); |
267 | if (userProf == null) | 268 | if (userProf == null) |
268 | { | 269 | { |
@@ -276,11 +277,22 @@ namespace OpenSim.Framework.Communications | |||
276 | } | 277 | } |
277 | } | 278 | } |
278 | 279 | ||
279 | public UUID AddUser(string firstName, string lastName, string password, uint regX, uint regY, UUID SetUUID) | 280 | /// <summary> |
281 | /// Adds the user. | ||
282 | /// </summary> | ||
283 | /// <param name="firstName">The first name.</param> | ||
284 | /// <param name="lastName">The last name.</param> | ||
285 | /// <param name="password">The password.</param> | ||
286 | /// <param name="email">The email.</param> | ||
287 | /// <param name="regX">The reg X.</param> | ||
288 | /// <param name="regY">The reg Y.</param> | ||
289 | /// <param name="SetUUID">The set UUID.</param> | ||
290 | /// <returns></returns> | ||
291 | public UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID) | ||
280 | { | 292 | { |
281 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); | 293 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); |
282 | 294 | ||
283 | m_userServiceAdmin.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY, SetUUID); | 295 | m_userServiceAdmin.AddUserProfile(firstName, lastName, md5PasswdHash, email, regX, regY, SetUUID); |
284 | UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); | 296 | UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); |
285 | if (userProf == null) | 297 | if (userProf == null) |
286 | { | 298 | { |