aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/CommunicationsManager.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-11-23 03:38:40 +0000
committerCharles Krinke2008-11-23 03:38:40 +0000
commit02fd7751d9b89d838fc8ca2dc60fe11f4cfe93a8 (patch)
treef95a3170f3dd41be8ccf10957aef7209492a0279 /OpenSim/Framework/Communications/CommunicationsManager.cs
parentAdd error handling to catch the WebExceptions thrown if you have (diff)
downloadopensim-SC_OLD-02fd7751d9b89d838fc8ca2dc60fe11f4cfe93a8.zip
opensim-SC_OLD-02fd7751d9b89d838fc8ca2dc60fe11f4cfe93a8.tar.gz
opensim-SC_OLD-02fd7751d9b89d838fc8ca2dc60fe11f4cfe93a8.tar.bz2
opensim-SC_OLD-02fd7751d9b89d838fc8ca2dc60fe11f4cfe93a8.tar.xz
Mantis#2660. Thank you kindly, Ruud Lathrop for a patch that:
This patch adds the option of adding the email when you create a new user. This works in Gridmode as none Gridmode. This option is also added to RemoteAdminPlugin. With a new handler you can create a user with a email.
Diffstat (limited to 'OpenSim/Framework/Communications/CommunicationsManager.cs')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs20
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 {